From nobody Wed Feb 12 14:44:48 2025 X-Original-To: dev-commits-src-main@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 4YtLgj1QRpz5mtyq; Wed, 12 Feb 2025 14:44:49 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtLgj0CtQz44Zf; Wed, 12 Feb 2025 14:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739371489; 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=jGnmlOfY5LGPSaSPuOwCkDwQ4ps1fLicH+Yb3xnD3Zc=; b=mZjt81Jl61jMNNOk8EWW9vyeu+/bcOldgsGgPmTnH2jvbyqu1Bc3BY9Rpx5/hxpKd1e9vG c/sFqbbDoYT9t2RA8dGrqcGuv7ZBFYnYCF33q1jxACaSv58XOhoCc+E2Yhy7NTIVHtVu9X yyTm9fLoBqZqMkvQxdwu48PWeBh9X2Urnqoty3qifMuYKAguToL0/dm/1TTCSNbwtwiSy4 zcRcmAjAyY93TVjPEC/uaChO55I2rplZEvrja6frXnqyNEX2TcyFy20ecySbevucqOmYW7 XpnTYZ84aVu+/xUVaoLbE9WSw6C22uGicPIIBJyVJzVGeisG1aLIKbcGtE58UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739371489; 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=jGnmlOfY5LGPSaSPuOwCkDwQ4ps1fLicH+Yb3xnD3Zc=; b=gzg5HoeFmdkYcnUU1zhnDwWO+l9PCy4fiRY2uu13XiZriGWLhXwa7C2lOJ2K991MRPXiwr +cUJYTTmPOGW76G/9KSUt6bfdVbLbTl30qW+dXbR/eRbCYdOKcW6eu4FqiLmk00YbDEVCn YrIYlQIrs8WFSGGuXwWjxFMDq7/mY57aVhHLzPAf2oXLIKDat5mu/yjyo9x2DMSoHwXQJ9 LEbJv7ztJUib/7AbcOI9G/RLRfgxee/oQN4xdK02dIsJ5rfI/eWfvFvKG1ZTyzCPsvDjji YXMwEQVbHMRWPJQllYp0fSC3zKLcgb4rgO4PJaC4YgcuKvpxDtiwZEGbxldliQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739371489; a=rsa-sha256; cv=none; b=q86Sz8Lr35iz7AtcnxFJIQGHA018KB7nsiLWG94NpcCVheqdeZcKe+23QyFheNce7P6zDi owqsLl56cCui4LffC/eL/66BLHHKwty9KbIvjZwPe1PbXRdr+0k1kipN6MzdbRNbKzM0Ds ZSD/975nhRG17douyZrjganQalEnzFsLdxk3ncdwKn7zfZAuR+YGZnTTaQYRDutj66YHFz JzC7IUeqmclFmDDtE4X0xThrbcow5r0v5b6YdWHldb5aFZxJppww2V9lN50LdStJiKMYrL DdmgVmPXPFogoHm1MJ3sH75MXp64kG3gHhHNASq1jF1V8xKmwCySOT9ldhPrSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YtLgh6v23z12Ym; Wed, 12 Feb 2025 14:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CEimkt016945; Wed, 12 Feb 2025 14:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CEim9L016942; Wed, 12 Feb 2025 14:44:48 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:44:48 GMT Message-Id: <202502121444.51CEim9L016942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 65cc5af1cf88 - main - sys tests: Add scapy as a required program List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65cc5af1cf88ed124ab16091624e918faa61c7f2 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=65cc5af1cf88ed124ab16091624e918faa61c7f2 commit 65cc5af1cf88ed124ab16091624e918faa61c7f2 Author: Jose Luis Duran AuthorDate: 2025-02-12 14:38:44 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 14:40:43 +0000 sys tests: Add scapy as a required program These atf-python tests rely on scapy to run. Add it as a required program. Reported by: glebius, kp Reviewed by: kp Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48946 --- tests/sys/netinet/carp.py | 2 ++ tests/sys/netinet/igmp.py | 1 + tests/sys/netpfil/pf/frag6.py | 3 +++ tests/sys/netpfil/pf/icmp.py | 2 ++ tests/sys/netpfil/pf/nat64.py | 4 ++++ tests/sys/netpfil/pf/nat66.py | 2 ++ 6 files changed, 14 insertions(+) diff --git a/tests/sys/netinet/carp.py b/tests/sys/netinet/carp.py index 0db31e79ba84..e35c9470d035 100644 --- a/tests/sys/netinet/carp.py +++ b/tests/sys/netinet/carp.py @@ -39,6 +39,7 @@ class TestCarp(VnetTestTemplate): if p.src != "00:00:5e:00:01:01": raise + @pytest.mark.require_progs(["scapy"]) def test_source_mac(self): "Test carp packets source address" @@ -52,6 +53,7 @@ class TestCarp(VnetTestTemplate): self.check_carp_src_mac(carp_pkts) + @pytest.mark.require_progs(["scapy"]) def test_source_mac_vrrp(self): "Test VRRP packets source address" diff --git a/tests/sys/netinet/igmp.py b/tests/sys/netinet/igmp.py index 4a4e67211bd7..5d3b38cac38f 100644 --- a/tests/sys/netinet/igmp.py +++ b/tests/sys/netinet/igmp.py @@ -80,6 +80,7 @@ class TestIGMP(VnetTestTemplate): sp = _sp super().setup_method(method) + @pytest.mark.require_progs(["scapy"]) def test_igmp3_join_leave(self): "Test that we send the expected join/leave IGMPv2 messages" diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py index f274fc28a3bf..108b53874d0b 100644 --- a/tests/sys/netpfil/pf/frag6.py +++ b/tests/sys/netpfil/pf/frag6.py @@ -43,6 +43,7 @@ class TestFrag6(VnetTestTemplate): return False @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_dup_frag_hdr(self): "Test packets with duplicate fragment headers" srv_vnet = self.vnet_map["vnet2"] @@ -64,6 +65,7 @@ class TestFrag6(VnetTestTemplate): assert not p.getlayer(sp.ICMPv6EchoReply) @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_overlong(self): "Test overly long fragmented packet" @@ -112,6 +114,7 @@ class TestFrag6_Overlap(VnetTestTemplate): ]) @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_overlap(self): "Ensure we discard packets with overlapping fragments" diff --git a/tests/sys/netpfil/pf/icmp.py b/tests/sys/netpfil/pf/icmp.py index e54f9f20a058..6ab649f62be7 100644 --- a/tests/sys/netpfil/pf/icmp.py +++ b/tests/sys/netpfil/pf/icmp.py @@ -86,6 +86,7 @@ class TestICMP(VnetTestTemplate): vnet.pipe.send("Got ICMP destination unreachable packet") @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_inner_match(self): vnet = self.vnet_map["vnet1"] dst_vnet = self.vnet_map["vnet3"] @@ -160,6 +161,7 @@ class TestICMP(VnetTestTemplate): return @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_fragmentation_needed(self): ToolsHelper.print_output("/sbin/route add default 192.0.2.1") diff --git a/tests/sys/netpfil/pf/nat64.py b/tests/sys/netpfil/pf/nat64.py index 64ec5ae15262..070b7a82e6d9 100644 --- a/tests/sys/netpfil/pf/nat64.py +++ b/tests/sys/netpfil/pf/nat64.py @@ -93,6 +93,7 @@ class TestNAT64(VnetTestTemplate): "pass in on %s inet6 af-to inet from 192.0.2.1" % ifname]) @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_tcp_rst(self): ToolsHelper.print_output("/sbin/route -6 add default 2001:db8::1") @@ -126,6 +127,7 @@ class TestNAT64(VnetTestTemplate): assert "A" in tcp.flags @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_udp_port_closed(self): ToolsHelper.print_output("/sbin/route -6 add default 2001:db8::1") @@ -147,6 +149,7 @@ class TestNAT64(VnetTestTemplate): assert udp.dport == 1222 @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_address_unreachable(self): ToolsHelper.print_output("/sbin/route -6 add default 2001:db8::1") @@ -172,6 +175,7 @@ class TestNAT64(VnetTestTemplate): assert ip6.hlim == 62 @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_udp_checksum(self): ToolsHelper.print_output("/sbin/route -6 add default 2001:db8::1") diff --git a/tests/sys/netpfil/pf/nat66.py b/tests/sys/netpfil/pf/nat66.py index 3a037ac710fc..f93512b5b99c 100644 --- a/tests/sys/netpfil/pf/nat66.py +++ b/tests/sys/netpfil/pf/nat66.py @@ -140,6 +140,7 @@ class TestNAT66(VnetTestTemplate): assert found @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_npt_icmp(self): cl_vnet = self.vnet_map["vnet1"] ifname = cl_vnet.iface_alias_map["if1"].name @@ -168,6 +169,7 @@ class TestNAT66(VnetTestTemplate): self.check_icmp_too_big(sp, 12000, 5000) @pytest.mark.require_user("root") + @pytest.mark.require_progs(["scapy"]) def test_npt_route_to_icmp(self): cl_vnet = self.vnet_map["vnet1"] ifname = cl_vnet.iface_alias_map["if1"].name