Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Mar 2025 22:58:29 GMT
From:      Jose Luis Duran <jlduran@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c564603e6449 - stable/14 - netinet6 tests: Add Scapy as a required program
Message-ID:  <202503012258.521MwTvP079340@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=c564603e6449dc94835c0a73e0a9b50bc43b0e00

commit c564603e6449dc94835c0a73e0a9b50bc43b0e00
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-02-17 19:50:24 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2025-03-01 22:53:06 +0000

    netinet6 tests: Add Scapy as a required program
    
    The ra.py script requires Scapy.  Invoke it using the python3 symlink.
    While technically, at the moment, python points to python3, and python3
    points to the current version of python, it is recommended to use
    python3.  No functional change intended.
    
    Add the Scapy requirement in the header of each test that makes use of
    it.
    
    Reviewed by:    kp
    Approved by:    emaste (mentor)
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D49005
    
    (cherry picked from commit ec60176e7d29d1e9f11121146603ce5b6b5f40b8)
---
 tests/sys/netinet6/ndp.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh
index 038a640f331e..378759eb9ba4 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 "python"
+	atf_set require.progs scapy
 }
 
 ndp_slaac_default_route_body() {
@@ -153,7 +153,7 @@ ndp_slaac_default_route_body() {
 	atf_check jexec ${jname} ifconfig ${epair0}a inet6 accept_rtadv
 
         # Send an RA advertising a prefix.
-	atf_check -e ignore python $(atf_get_srcdir)/ra.py \
+	atf_check -e ignore python3 $(atf_get_srcdir)/ra.py \
 	    --sendif ${epair0}b \
 	    --dst $(ndp_if_lladdr ${epair0}a ${jname}) \
 	    --src $(ndp_if_lladdr ${epair0}b) \
@@ -172,7 +172,7 @@ ndp_slaac_default_route_body() {
 	    jexec ${jname} netstat -rn -6
 
 	# Send another RA, make sure that the default route is installed again.
-	atf_check -e ignore python $(atf_get_srcdir)/ra.py \
+	atf_check -e ignore python3 $(atf_get_srcdir)/ra.py \
 	    --sendif ${epair0}b \
 	    --dst $(ndp_if_lladdr ${epair0}a ${jname}) \
 	    --src $(ndp_if_lladdr ${epair0}b) \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503012258.521MwTvP079340>