Date: Mon, 3 Mar 2025 07:55:16 GMT From: Jose Luis Duran <jlduran@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c46af893cd7a - main - tests: Require python3 when using Scapy Message-ID: <202503030755.5237tGA7074707@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=c46af893cd7aaff322b6f867539bc8fe5bcde6f9 commit c46af893cd7aaff322b6f867539bc8fe5bcde6f9 Author: Jose Luis Duran <jlduran@FreeBSD.org> AuthorDate: 2025-03-03 07:52:33 +0000 Commit: Jose Luis Duran <jlduran@FreeBSD.org> CommitDate: 2025-03-03 07:52:33 +0000 tests: Require python3 when using Scapy python3 is a symbolic link that points to the current python 3.X version. It is possible for a system to have python (python 3.X) without the python3 (symlink) package. Test scripts that use Scapy are invoked using python3, so add it as a required program. Reviewed by: ngie, asomers Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D49007 --- tests/sys/net/if_bridge_test.sh | 4 ++-- tests/sys/net/if_vlan.sh | 2 +- tests/sys/netinet/divert.sh | 4 ++-- tests/sys/netinet/forward.sh | 8 ++++---- tests/sys/netinet/redirect.sh | 2 +- tests/sys/netinet6/divert.sh | 2 +- tests/sys/netinet6/exthdr.sh | 2 +- tests/sys/netinet6/forward6.sh | 12 ++++++------ tests/sys/netinet6/frag6/frag6.subr | 2 +- tests/sys/netinet6/mld.sh | 2 +- tests/sys/netinet6/ndp.sh | 2 +- tests/sys/netinet6/redirect.sh | 2 +- tests/sys/netinet6/scapyi386.sh | 2 +- tests/sys/netpfil/common/forward.sh | 2 +- tests/sys/netpfil/common/tos.sh | 2 +- tests/sys/netpfil/pf/dup.sh | 2 +- tests/sys/netpfil/pf/ether.sh | 4 ++-- tests/sys/netpfil/pf/forward.sh | 4 ++-- tests/sys/netpfil/pf/fragmentation_compat.sh | 8 ++++---- tests/sys/netpfil/pf/fragmentation_no_reassembly.sh | 6 +++--- tests/sys/netpfil/pf/fragmentation_pass.sh | 18 +++++++++--------- tests/sys/netpfil/pf/get_state.sh | 2 +- tests/sys/netpfil/pf/icmp.sh | 2 +- tests/sys/netpfil/pf/icmp6.sh | 2 +- tests/sys/netpfil/pf/killstate.sh | 16 ++++++++-------- tests/sys/netpfil/pf/max_states.sh | 2 +- tests/sys/netpfil/pf/modulate.sh | 4 ++-- tests/sys/netpfil/pf/pass_block.sh | 2 +- tests/sys/netpfil/pf/pflog.sh | 2 +- tests/sys/netpfil/pf/pflow.sh | 8 ++++---- tests/sys/netpfil/pf/pfsync.sh | 12 ++++++------ tests/sys/netpfil/pf/route_to.sh | 8 ++++---- tests/sys/netpfil/pf/rtable.sh | 4 ++-- tests/sys/netpfil/pf/scrub.sh | 16 ++++++++-------- tests/sys/netpfil/pf/scrub_compat.sh | 16 ++++++++-------- tests/sys/netpfil/pf/scrub_pass.sh | 12 ++++++------ tests/sys/netpfil/pf/set_tos.sh | 4 ++-- tests/sys/netpfil/pf/src_track.sh | 8 ++++---- tests/sys/netpfil/pf/syncookie.sh | 6 +++--- tests/sys/netpfil/pf/tcp.sh | 2 +- 40 files changed, 110 insertions(+), 110 deletions(-) diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index 66656be1d84f..46ebb17edbdc 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -271,7 +271,7 @@ span_head() { atf_set descr 'Bridge span test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } span_body() @@ -420,7 +420,7 @@ stp_validation_head() { atf_set descr 'Check STP validation' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } stp_validation_body() diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh index 41dac6222cbb..424eac705b94 100755 --- a/tests/sys/net/if_vlan.sh +++ b/tests/sys/net/if_vlan.sh @@ -257,7 +257,7 @@ bpf_pcp_head() { atf_set descr 'Set VLAN PCP through BPF' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } bpf_pcp_body() diff --git a/tests/sys/netinet/divert.sh b/tests/sys/netinet/divert.sh index c3b1896b995e..d50620d94a09 100755 --- a/tests/sys/netinet/divert.sh +++ b/tests/sys/netinet/divert.sh @@ -41,7 +41,7 @@ ipdivert_ip_output_remote_success_head() { atf_set descr 'Test diverting IPv4 packet to remote destination' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ipdivert_ip_output_remote_success_body() { @@ -96,7 +96,7 @@ ipdivert_ip_input_local_success_head() { atf_set descr 'Test diverting IPv4 packet to remote destination' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ipdivert_ip_input_local_success_body() { diff --git a/tests/sys/netinet/forward.sh b/tests/sys/netinet/forward.sh index 3ae83eb3edc5..be69e91b6137 100755 --- a/tests/sys/netinet/forward.sh +++ b/tests/sys/netinet/forward.sh @@ -34,7 +34,7 @@ fwd_ip_icmp_iface_fast_success_head() { atf_set descr 'Test valid IPv4 on-stick fastforwarding to iface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip_icmp_iface_fast_success_body() { @@ -90,7 +90,7 @@ fwd_ip_icmp_gw_fast_success_head() { atf_set descr 'Test valid IPv4 on-stick fastforwarding to gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip_icmp_gw_fast_success_body() { @@ -150,7 +150,7 @@ fwd_ip_icmp_iface_slow_success_head() { atf_set descr 'Test valid IPv4 on-stick "slow" forwarding to iface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip_icmp_iface_slow_success_body() { @@ -204,7 +204,7 @@ fwd_ip_icmp_gw_slow_success_head() { atf_set descr 'Test valid IPv4 on-stick "slow" forwarding to gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip_icmp_gw_slow_success_body() { diff --git a/tests/sys/netinet/redirect.sh b/tests/sys/netinet/redirect.sh index 4a069d515bb0..ad5b562da57a 100755 --- a/tests/sys/netinet/redirect.sh +++ b/tests/sys/netinet/redirect.sh @@ -34,7 +34,7 @@ valid_redirect_head() { atf_set descr 'Test valid IPv4 redirect' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } valid_redirect_body() { diff --git a/tests/sys/netinet6/divert.sh b/tests/sys/netinet6/divert.sh index 788f539dfe9a..e2dc3e26d97e 100755 --- a/tests/sys/netinet6/divert.sh +++ b/tests/sys/netinet6/divert.sh @@ -41,7 +41,7 @@ ipdivert_ip6_output_remote_success_head() { atf_set descr 'Test valid IPv6 redirect' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ipdivert_ip6_output_remote_success_body() { diff --git a/tests/sys/netinet6/exthdr.sh b/tests/sys/netinet6/exthdr.sh index 350307f13eae..3d866d85ea83 100755 --- a/tests/sys/netinet6/exthdr.sh +++ b/tests/sys/netinet6/exthdr.sh @@ -32,7 +32,7 @@ exthdr_head() { atf_set descr 'Test IPv6 extension header code paths' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } exthdr_body() { diff --git a/tests/sys/netinet6/forward6.sh b/tests/sys/netinet6/forward6.sh index 40d17837d6f2..e4b027bf281a 100755 --- a/tests/sys/netinet6/forward6.sh +++ b/tests/sys/netinet6/forward6.sh @@ -34,7 +34,7 @@ fwd_ip6_gu_icmp_iface_fast_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to interface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_iface_fast_success_body() { @@ -104,7 +104,7 @@ fwd_ip6_gu_icmp_gw_gu_fast_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to GU gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_gw_gu_fast_success_body() { @@ -178,7 +178,7 @@ fwd_ip6_gu_icmp_gw_ll_fast_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to LL gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_gw_ll_fast_success_body() { @@ -253,7 +253,7 @@ fwd_ip6_gu_icmp_iface_slow_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to interface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_iface_slow_success_body() { @@ -322,7 +322,7 @@ fwd_ip6_gu_icmp_gw_gu_slow_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to GU gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_gw_gu_slow_success_body() { @@ -397,7 +397,7 @@ fwd_ip6_gu_icmp_gw_ll_slow_success_head() { atf_set descr 'Test valid IPv6 global unicast fast-forwarding to LL gw' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } fwd_ip6_gu_icmp_gw_ll_slow_success_body() { diff --git a/tests/sys/netinet6/frag6/frag6.subr b/tests/sys/netinet6/frag6/frag6.subr index 70e7386b60cc..238c9619c398 100644 --- a/tests/sys/netinet6/frag6/frag6.subr +++ b/tests/sys/netinet6/frag6/frag6.subr @@ -31,7 +31,7 @@ frag6_head() { atf_set descr 'Test IPv6 fragmentation code' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } frag6_body() diff --git a/tests/sys/netinet6/mld.sh b/tests/sys/netinet6/mld.sh index 7229aa34dc52..d98624daedf5 100755 --- a/tests/sys/netinet6/mld.sh +++ b/tests/sys/netinet6/mld.sh @@ -32,7 +32,7 @@ mldraw01_head() { atf_set descr 'Test for correct Ethernet Destination MAC address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } mldraw01_body() { diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 378759eb9ba4..bac9764ee3c9 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -134,7 +134,7 @@ atf_test_case "ndp_slaac_default_route" "cleanup" ndp_slaac_default_route_head() { atf_set descr 'Test default route installation via SLAAC' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ndp_slaac_default_route_body() { diff --git a/tests/sys/netinet6/redirect.sh b/tests/sys/netinet6/redirect.sh index 64efe7339ffd..aa0731d89101 100644 --- a/tests/sys/netinet6/redirect.sh +++ b/tests/sys/netinet6/redirect.sh @@ -34,7 +34,7 @@ valid_redirect_head() { atf_set descr 'Test valid IPv6 redirect' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } valid_redirect_body() { diff --git a/tests/sys/netinet6/scapyi386.sh b/tests/sys/netinet6/scapyi386.sh index bb9ee4cfcd2a..2d91f25dd01e 100755 --- a/tests/sys/netinet6/scapyi386.sh +++ b/tests/sys/netinet6/scapyi386.sh @@ -32,7 +32,7 @@ scapyi386_head() { atf_set descr 'Test for correct Ethernet Destination MAC address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } scapyi386_body() { diff --git a/tests/sys/netpfil/common/forward.sh b/tests/sys/netpfil/common/forward.sh index 939ce55f2d33..fa1f97aa0390 100644 --- a/tests/sys/netpfil/common/forward.sh +++ b/tests/sys/netpfil/common/forward.sh @@ -33,7 +33,7 @@ v4_head() { atf_set descr 'Basic forwarding test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v4_body() diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh index 39f756be8fe9..3b689d7f67d0 100644 --- a/tests/sys/netpfil/common/tos.sh +++ b/tests/sys/netpfil/common/tos.sh @@ -33,7 +33,7 @@ tos_head() { atf_set descr 'set-tos test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } tos_body() diff --git a/tests/sys/netpfil/pf/dup.sh b/tests/sys/netpfil/pf/dup.sh index 68631251144a..64a08083bca0 100644 --- a/tests/sys/netpfil/pf/dup.sh +++ b/tests/sys/netpfil/pf/dup.sh @@ -33,7 +33,7 @@ dup_to_head() { atf_set descr 'dup-to test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } dup_to_body() diff --git a/tests/sys/netpfil/pf/ether.sh b/tests/sys/netpfil/pf/ether.sh index 104baf468aa4..f0fdce50a7d3 100644 --- a/tests/sys/netpfil/pf/ether.sh +++ b/tests/sys/netpfil/pf/ether.sh @@ -643,7 +643,7 @@ short_pkt_head() { atf_set descr 'Test overly short Ethernet packets' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } short_pkt_body() @@ -686,7 +686,7 @@ bridge_to_head() { atf_set descr 'Test bridge-to keyword' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } bridge_to_body() diff --git a/tests/sys/netpfil/pf/forward.sh b/tests/sys/netpfil/pf/forward.sh index 31abfad82c13..5d7d48a5dd9a 100644 --- a/tests/sys/netpfil/pf/forward.sh +++ b/tests/sys/netpfil/pf/forward.sh @@ -35,7 +35,7 @@ v4_head() atf_set require.user root # We need scapy to be installed for out test scripts to work - atf_set require.progs scapy + atf_set require.progs python3 scapy } v4_body() @@ -94,7 +94,7 @@ v6_head() { atf_set descr 'Basic IPv6 forwarding test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v6_body() diff --git a/tests/sys/netpfil/pf/fragmentation_compat.sh b/tests/sys/netpfil/pf/fragmentation_compat.sh index e9b89f5ff170..1f4550ebd69e 100644 --- a/tests/sys/netpfil/pf/fragmentation_compat.sh +++ b/tests/sys/netpfil/pf/fragmentation_compat.sh @@ -74,7 +74,7 @@ v6_head() { atf_set descr 'IPv6 fragmentation test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v6_body() @@ -230,7 +230,7 @@ overreplace_head() { atf_set descr 'ping fragment that overlaps fragment at index boundary and replace it' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overreplace_body() @@ -248,7 +248,7 @@ overindex_head() { atf_set descr 'ping fragment that overlaps the first fragment at index boundary' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overindex_body() @@ -266,7 +266,7 @@ overlimit_head() { atf_set descr 'ping fragment at index boundary that cannot be requeued' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overlimit_body() diff --git a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh index fb5c15ac2ff8..7cab89f5debb 100644 --- a/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh +++ b/tests/sys/netpfil/pf/fragmentation_no_reassembly.sh @@ -32,7 +32,7 @@ match_full_v4_head() { atf_set descr 'Matching non-fragmented IPv4 packets' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } match_full_v4_body() @@ -63,7 +63,7 @@ match_fragment_v4_head() { atf_set descr 'Matching fragmented IPv4 packets' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } match_fragment_v4_body() @@ -93,7 +93,7 @@ compat_override_v4_head() { atf_set descr 'Scrub rules override "set reassemble" for IPv4' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } compat_override_v4_body() diff --git a/tests/sys/netpfil/pf/fragmentation_pass.sh b/tests/sys/netpfil/pf/fragmentation_pass.sh index 9255e6f738cf..5deaba18301d 100644 --- a/tests/sys/netpfil/pf/fragmentation_pass.sh +++ b/tests/sys/netpfil/pf/fragmentation_pass.sh @@ -77,7 +77,7 @@ v6_head() { atf_set descr 'IPv6 fragmentation test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v6_body() @@ -305,7 +305,7 @@ overreplace_head() { atf_set descr 'ping fragment that overlaps fragment at index boundary and replace it' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overreplace_body() @@ -323,7 +323,7 @@ overindex_head() { atf_set descr 'ping fragment that overlaps the first fragment at index boundary' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overindex_body() @@ -341,7 +341,7 @@ overlimit_head() { atf_set descr 'ping fragment at index boundary that cannot be requeued' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overlimit_body() @@ -359,7 +359,7 @@ overhole_head() { atf_set descr 'ping fragment at index boundary which modifies pf hole counter' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } overhole_body() @@ -377,7 +377,7 @@ adjhole_head() { atf_set descr 'overlapping ping fragments which modifies pf hole counter' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } adjhole_body() @@ -443,7 +443,7 @@ no_df_head() { atf_set descr 'Test removing of DF flag' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } no_df_body() @@ -482,7 +482,7 @@ reassemble_slowpath_head() { atf_set descr 'Test reassembly on the slow path' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } reassemble_slowpath_body() @@ -611,7 +611,7 @@ dummynet_fragmented_head() { atf_set descr 'Test dummynet on NATed fragmented traffic' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } dummynet_fragmented_body() diff --git a/tests/sys/netpfil/pf/get_state.sh b/tests/sys/netpfil/pf/get_state.sh index 35adf64f6b11..eb2bc854c800 100644 --- a/tests/sys/netpfil/pf/get_state.sh +++ b/tests/sys/netpfil/pf/get_state.sh @@ -33,7 +33,7 @@ many_head() { atf_set descr 'Test retrieving many states' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } many_body() diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh index f4c8ec5e5836..279e3c7a29d5 100644 --- a/tests/sys/netpfil/pf/icmp.sh +++ b/tests/sys/netpfil/pf/icmp.sh @@ -33,7 +33,7 @@ cve_2019_5598_head() { atf_set descr 'Test CVE-2019-5598' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } cve_2019_5598_body() diff --git a/tests/sys/netpfil/pf/icmp6.sh b/tests/sys/netpfil/pf/icmp6.sh index eb286e23ef4c..c55af906e3a6 100644 --- a/tests/sys/netpfil/pf/icmp6.sh +++ b/tests/sys/netpfil/pf/icmp6.sh @@ -33,7 +33,7 @@ zero_id_head() { atf_set descr 'Test ICMPv6 echo with ID 0 keep being blocked' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } zero_id_body() diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index 36743b1d8016..5d8e040d3cbb 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -47,7 +47,7 @@ v4_head() { atf_set descr 'Test killing states by IPv4 address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v4_body() @@ -110,7 +110,7 @@ v6_head() { atf_set descr 'Test killing states by IPv6 address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v6_body() @@ -177,7 +177,7 @@ label_head() { atf_set descr 'Test killing states by label' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } label_body() @@ -241,7 +241,7 @@ multilabel_head() { atf_set descr 'Test killing states with multiple labels by label' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } multilabel_body() @@ -321,7 +321,7 @@ gateway_head() { atf_set descr 'Test killing states by route-to/reply-to address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } gateway_body() @@ -462,7 +462,7 @@ interface_head() { atf_set descr 'Test killing states based on interface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } interface_body() @@ -518,7 +518,7 @@ id_head() { atf_set descr 'Test killing states by id' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } id_body() @@ -579,7 +579,7 @@ nat_head() { atf_set descr 'Test killing states by their NAT-ed IP address' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } nat_body() diff --git a/tests/sys/netpfil/pf/max_states.sh b/tests/sys/netpfil/pf/max_states.sh index 3548d838e3a6..1bf6814f9283 100755 --- a/tests/sys/netpfil/pf/max_states.sh +++ b/tests/sys/netpfil/pf/max_states.sh @@ -31,7 +31,7 @@ max_states_head() { atf_set descr 'Max states per rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } max_states_body() diff --git a/tests/sys/netpfil/pf/modulate.sh b/tests/sys/netpfil/pf/modulate.sh index 98d5df14a44d..1abe22cff391 100644 --- a/tests/sys/netpfil/pf/modulate.sh +++ b/tests/sys/netpfil/pf/modulate.sh @@ -31,7 +31,7 @@ modulate_v4_head() { atf_set descr 'IPv4 TCP sequence number modulation' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } modulate_v4_body() @@ -54,7 +54,7 @@ modulate_v6_head() { atf_set descr 'IPv6 TCP sequence number modulation' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } modulate_v6_body() diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh index b8ad5a86b102..e955068d014b 100644 --- a/tests/sys/netpfil/pf/pass_block.sh +++ b/tests/sys/netpfil/pf/pass_block.sh @@ -232,7 +232,7 @@ urpf_head() { atf_set descr "Test unicast reverse path forwarding check" atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } urpf_body() diff --git a/tests/sys/netpfil/pf/pflog.sh b/tests/sys/netpfil/pf/pflog.sh index a315b88bd4c0..0758723c604d 100644 --- a/tests/sys/netpfil/pf/pflog.sh +++ b/tests/sys/netpfil/pf/pflog.sh @@ -34,7 +34,7 @@ malformed_head() { atf_set descr 'Test that we do not log malformed packets as passing' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } malformed_body() diff --git a/tests/sys/netpfil/pf/pflow.sh b/tests/sys/netpfil/pf/pflow.sh index f0552eb061da..1122096d2e31 100644 --- a/tests/sys/netpfil/pf/pflow.sh +++ b/tests/sys/netpfil/pf/pflow.sh @@ -85,7 +85,7 @@ state_defaults_head() { atf_set descr 'Test set state-defaults pflow' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } state_defaults_body() @@ -146,7 +146,7 @@ v6_head() { atf_set descr 'Test pflow over IPv6' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } v6_body() @@ -188,7 +188,7 @@ nat_head() { atf_set descr 'Test pflow export for NAT44' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } nat_body() @@ -239,7 +239,7 @@ rule_head() { atf_set descr 'Test per-rule pflow option' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } rule_body() diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 0f3505460b50..7f545b43a066 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -126,7 +126,7 @@ defer_head() { atf_set descr 'Defer mode pfsync test' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } defer_body() @@ -907,7 +907,7 @@ route_to_1301_head() { atf_set descr 'Test route-to with pfsync version 13.1' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } route_to_1301_body() @@ -947,7 +947,7 @@ route_to_1301_bad_ruleset_head() { atf_set descr 'Test route-to with pfsync version 13.1 and incompatible ruleset' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } route_to_1301_bad_ruleset_body() @@ -997,7 +997,7 @@ route_to_1301_bad_rpool_head() { atf_set descr 'Test route-to with pfsync version 13.1 and different interface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } route_to_1301_bad_rpool_body() @@ -1045,7 +1045,7 @@ route_to_1400_bad_ruleset_head() { atf_set descr 'Test route-to with pfsync version 14.0' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } route_to_1400_bad_ruleset_body() @@ -1085,7 +1085,7 @@ route_to_1400_bad_ifname_head() { atf_set descr 'Test route-to with pfsync version 14.0' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } route_to_1400_bad_ifname_body() diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index 06a320f5fac2..0354d1f59306 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -256,7 +256,7 @@ icmp_nat_head() { atf_set descr 'Test that ICMP packets are correct for route-to + NAT' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } icmp_nat_body() @@ -516,7 +516,7 @@ ifbound_reply_to_head() { atf_set descr 'Test that reply-to states bind to the expected interface' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ifbound_reply_to_body() @@ -572,7 +572,7 @@ ifbound_reply_to_v6_head() { atf_set descr 'Test that reply-to states bind to the expected interface for IPv6' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ifbound_reply_to_v6_body() @@ -632,7 +632,7 @@ ifbound_reply_to_rdr_dummynet_head() { atf_set descr 'Test that reply-to states bind to the expected non-default-route interface after rdr and dummynet' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } ifbound_reply_to_rdr_dummynet_body() diff --git a/tests/sys/netpfil/pf/rtable.sh b/tests/sys/netpfil/pf/rtable.sh index 62b37462e948..bb2cada57049 100644 --- a/tests/sys/netpfil/pf/rtable.sh +++ b/tests/sys/netpfil/pf/rtable.sh @@ -31,7 +31,7 @@ forward_v4_head() { atf_set descr 'Test IPv4 forwarding with rtable' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } forward_v4_body() @@ -78,7 +78,7 @@ forward_v6_head() { atf_set descr 'Test IPv6 forwarding with rtable' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } forward_v6_body() diff --git a/tests/sys/netpfil/pf/scrub.sh b/tests/sys/netpfil/pf/scrub.sh index b9efdaf5205c..6a5b748bed7b 100644 --- a/tests/sys/netpfil/pf/scrub.sh +++ b/tests/sys/netpfil/pf/scrub.sh @@ -32,7 +32,7 @@ max_mss_v4_head() { atf_set descr 'Test IPv4 scrub "mss" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } max_mss_v4_body() @@ -57,7 +57,7 @@ max_mss_v6_head() { atf_set descr 'Test IPv6 scrub "mss" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } max_mss_v6_body() @@ -82,7 +82,7 @@ set_tos_v4_head() { atf_set descr 'Test IPv4 scub "set-tos" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } set_tos_v4_body() @@ -103,7 +103,7 @@ set_tos_v6_head() { atf_set descr 'Test IPv6 scub "set-tos" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } set_tos_v6_body() @@ -124,7 +124,7 @@ min_ttl_v4_head() { atf_set descr 'Test IPv4 scub "min-ttl" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } min_ttl_v4_body() @@ -145,7 +145,7 @@ min_ttl_v6_head() { atf_set descr 'Test IPv6 scub "min-ttl" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } min_ttl_v6_body() @@ -166,7 +166,7 @@ no_scrub_v4_head() { atf_set descr 'Test IPv4 "no scrub" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } no_scrub_v4_body() @@ -189,7 +189,7 @@ no_scrub_v6_head() { atf_set descr 'Test IPv6 "no scrub" rule' atf_set require.user root - atf_set require.progs scapy + atf_set require.progs python3 scapy } no_scrub_v6_body() diff --git a/tests/sys/netpfil/pf/scrub_compat.sh b/tests/sys/netpfil/pf/scrub_compat.sh index cf69da3f3b74..6e1499309869 100644 --- a/tests/sys/netpfil/pf/scrub_compat.sh +++ b/tests/sys/netpfil/pf/scrub_compat.sh @@ -33,7 +33,7 @@ max_mss_v4_head() { atf_set descr 'Test IPv4 scrub "mss" rule' atf_set require.user root - atf_set require.progs scapy *** 231 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503030755.5237tGA7074707>