From nobody Wed Oct 28 20:27:40 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 4jFJnt0YGhz6x5P9 for ; Wed, 28 Oct 2026 20:27:46 +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 4jFJns4PY5z4PJp for ; Wed, 28 Oct 2026 20:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219265; 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=CgAQNR5yMNW/5MqXy2XQCqQdHK8KV+w6RKaX33mx4Xg=; b=jP24dej5I1RCgTCYLpR0lcTXw4qscoPDsv0VK9/B2FHIUJ1Q7rmMYEDwDfPi0+m4u1Vck0 Or/u4oKvUso8Vug+V1uoo3fhDdCsfAMTar6vKs+wUmj+hOo4K/ITAJV+9pYORdQKwzOKpm xs6zSjB5mWeHG1YDs4a4PyidTbIWK3gjRFZ60C7T6h3ltOTWO873YuoC5LEG1ycY6uRmq2 cG5A9wSBf92hMPSGMy+uAKQ/hCyEbASNaQUgb6BrHeFCJ4Z+UdS8VUQI5RK2swyrzE5S7w eGRlvdh1oYo1KfF6hC3O5BShRN1aDdCuetMSX7n+PhRYpQ7X+mCzR7Ssoz4xKA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219265; b=ChGaxw1X4qYgc+Lt1o50aHjn22HQnD5M1FP6Q09kcrEhOSKWIjWtCkaZoknobcvFi9A8sy jbPIpDilAta/JuPwrqJV2c92Db1D43zKX1t5233wU7UrheIMj/KJXaaQqfPZHnCibumXnf Hj6Qyof/cylzRrj/7bekWSGRVXNWkDTE2517eRiSrMOM3BFflWHpkz7NFM0oLMabflksAz OmUOvIGPaDZrFIYabkR6rH84kDuwu4TpQ20rZZiNloCEaeXIYZ3ZxcRHBVkrlI05t1WVQW 6DHiyYnm14Taoh1F86MWxEhDKooDRmIC3AqaU/tnGH3RsyY96hicji0dHxc9yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219265; 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=CgAQNR5yMNW/5MqXy2XQCqQdHK8KV+w6RKaX33mx4Xg=; b=mtwERY7WxfyqMY4oiGu2AsmeCYDy2/3k63WoCYIg7/6THrJu1IfOMgznwzEyyZOxfTILDx e4MQp/io6BtoPv/aq7TmTNp1MXDznMzP295YyfQI3nRWEAjjsXFxzwio6P14Ovl/DGUnl9 bcd9F7ud29U3bTW4FQjGnjv5rIAFKsThen4vSVVNBmAohCC6BobgCUQchdCxliX4TXOXYS Iki7l0hsmAD5GHv6K7s7kJw17lIryGnz3S3m24EoHfb5xYmhgbZLk1zt8BIbu7nb29CAis 45mFirGqJWpaHg/M5I2+1KP7H8DPNW9q6HJtp8XsFR+/Ffx0p2irp6qTwdDAew== 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 4jFJns3WXqz1MDp for ; Wed, 28 Oct 2026 20:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:27:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8fa55fdcae4e - main - 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 Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 8fa55fdcae4ecbd2ec13ef91cc9d172095e21189 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:27:40 +0000 Message-Id: <6ae25abc.19d40.2f936100@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8fa55fdcae4ecbd2ec13ef91cc9d172095e21189 commit 8fa55fdcae4ecbd2ec13ef91cc9d172095e21189 Author: Mark Johnston AuthorDate: 2026-10-28 20:26:44 +0000 Commit: Mark Johnston CommitDate: 2026-10-28 20:26:44 +0000 tests/dhclient: Skip tests if scapy is not installed Fixes: a143197801c6 ("dhclient: Add some regression tests") --- 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