From nobody Fri Nov 13 22:07:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jRBG33V7pz6yCQX for ; Fri, 13 Nov 2026 22:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRBG316kpz3KWP for ; Fri, 13 Nov 2026 22:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8+DJTSXMJZ/13HAESb1zqRkkU5wdoN7RjPsllUGpm0=; b=wwTuOn51qSQXRn1VlIdczEWvGlUahLU1NTTRekPz3emI3nazT6yoH0wXzSRXVfFZaObGDr bUoRIeLOBfK5BNBg3JXy6AYc6OYIUzb6B0crDqk75+4iyNo6HPXstAfJbdEDNi9jsHjbqB EkowNzvbNg+ZrQw45wJJ9HVsLqRWAWgnTiNBU6v0KNMeds/ueDelvanrNEJJBYgOoSu8km WDOdde5nVHsTAIKflic8pslvolizsVrCVRd1iCvlTIyRjQQE3WAPV7rXvXcaaS6e9pDWK5 hF9RVD0PbuqrTPbXYMZuHF4xTc+6sboFU9cjAxphzOM88YT83lFIc8Tb8681zg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794607675; b=o+hMzrgtBvjcGGsLRHdBJd7CMpV1CmrVOd9qtchAdBnQk42U3idKv68w+p/NrOx+4e+2rM 0sHrE2eyktzAr4h7pbTvdgIWsQJI/rVhE17Te+NrcDy5thHl0X/ilRwbDt4uSdyqd0+cfa 1lVu4dqru1bLSRrGBFASSzSWOLaYJ5SlVHxwOqBlsasyGPGWPZFQTtZdpjWvOY81s4HG1Q MEMnAh/DPDLZ00zs8ZSuKRz5dHPydyVkwjAVcJA8+9LH4EZ3+Wt8GwOFeH65fHHBM0Iof1 Wd80KuPY44EABm+Zmh+0mv8WzcY3gReaVf6qQsDddRZZaa2Y6HqmKgdAzgmbwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N8+DJTSXMJZ/13HAESb1zqRkkU5wdoN7RjPsllUGpm0=; b=iJzpLx51VKkCeecgbook0km8AtNGbej8sYx7Hz5alVQVTCVIDEyFEIEYlOu3OoUEfF9OFo rMOp+onfOnWIsJYQFEzrIYXWo2rd6932UKbBI+PlKeJr7dR23xl35tIKq40rZAc0K+vEiu Fu9NZ/E62aBY1VuOEeOGclmApYd//umRWa0K2gNLUOIdjzND3z5LawlzsnSEPGCC3PBDGt zeNkj1wFho0fLiIWDHQP3LOXEy52g3irEJkLSJjjBzg8oMF5Ws4oqnXo3grko/ptKTA423 qywGLb95HRk7imHGHbPJYdEhV7fzX1GkIjr/DvAWNRCDGnMAR47z8+OD8V9ULA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jRBG30f8szv3W for ; Fri, 13 Nov 2026 22:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 22:07:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 48a3e1f5d3b2 - stable/14 - tests/dhclient: Skip tests if scapy is not installed List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48a3e1f5d3b2b9dfe1330376732d4aca1804a69f Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 22:07:55 +0000 Message-Id: <6af78a3b.ce3f.53bf0b77@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48a3e1f5d3b2b9dfe1330376732d4aca1804a69f commit 48a3e1f5d3b2b9dfe1330376732d4aca1804a69f Author: Mark Johnston AuthorDate: 2026-10-28 20:26:44 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 22:07:31 +0000 tests/dhclient: Skip tests if scapy is not installed Fixes: a143197801c6 ("dhclient: Add some regression tests") (cherry picked from commit 8fa55fdcae4ecbd2ec13ef91cc9d172095e21189) --- sbin/dhclient/tests/functional.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/dhclient/tests/functional.py b/sbin/dhclient/tests/functional.py index 205bd11a76ef..518d1050aba7 100644 --- a/sbin/dhclient/tests/functional.py +++ b/sbin/dhclient/tests/functional.py @@ -20,8 +20,6 @@ def mac_to_chaddr(mac_str): return mac_bytes + b"\x00" * (16 - len(mac_bytes)) - - class TestDhclient(VnetTestTemplate): _SERVER_IP = "192.0.2.1" _CLIENT_IP = "192.0.2.10" @@ -169,6 +167,7 @@ class TestDhclient(VnetTestTemplate): ) @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_classless_routes_truncated(self): """ Verify that dhclient rejects a DHCPOFFER containing a truncated @@ -198,6 +197,7 @@ class TestDhclient(VnetTestTemplate): assert "inet {}".format(self._CLIENT_IP) in result["ifconfig"] @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_filename_backslash(self): """ Verify that backslashes in the BOOTP filename don't cause the @@ -212,6 +212,7 @@ class TestDhclient(VnetTestTemplate): assert "inet {}".format(self._CLIENT_IP) in result["ifconfig"] @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_sname_valid(self): """ Verify that a valid server name is preserved in the lease file. @@ -225,6 +226,7 @@ class TestDhclient(VnetTestTemplate): assert "dhcp.example.com" in result["lease"] @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_sname_quote(self): """ Verify that a double quote in the BOOTP server name causes the