Commit d75df752 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski

selftests: net: fix setup_ns usage in rtnetlink.sh

The setup_ns helper marks the testns global variable as
readonly. Later attempts to set such variable are unsuccessful,
causing a couple test failures.

Avoid completely the variable re-initialization and let the
function access the global value.

Fixes: e9ce7ede ("selftests: rtnetlink: use setup_ns in bonding test")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/6e7c937c8ff73ca52a21a4a536a13a76ec0173a8.1706812005.git.pabeni@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent cb9f4a30
...@@ -440,7 +440,6 @@ kci_test_encap_vxlan() ...@@ -440,7 +440,6 @@ kci_test_encap_vxlan()
local ret=0 local ret=0
vxlan="test-vxlan0" vxlan="test-vxlan0"
vlan="test-vlan0" vlan="test-vlan0"
testns="$1"
run_cmd ip -netns "$testns" link add "$vxlan" type vxlan id 42 group 239.1.1.1 \ run_cmd ip -netns "$testns" link add "$vxlan" type vxlan id 42 group 239.1.1.1 \
dev "$devdummy" dstport 4789 dev "$devdummy" dstport 4789
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
...@@ -485,7 +484,6 @@ kci_test_encap_fou() ...@@ -485,7 +484,6 @@ kci_test_encap_fou()
{ {
local ret=0 local ret=0
name="test-fou" name="test-fou"
testns="$1"
run_cmd_grep 'Usage: ip fou' ip fou help run_cmd_grep 'Usage: ip fou' ip fou help
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
end_test "SKIP: fou: iproute2 too old" end_test "SKIP: fou: iproute2 too old"
...@@ -526,8 +524,8 @@ kci_test_encap() ...@@ -526,8 +524,8 @@ kci_test_encap()
run_cmd ip -netns "$testns" link set lo up run_cmd ip -netns "$testns" link set lo up
run_cmd ip -netns "$testns" link add name "$devdummy" type dummy run_cmd ip -netns "$testns" link add name "$devdummy" type dummy
run_cmd ip -netns "$testns" link set "$devdummy" up run_cmd ip -netns "$testns" link set "$devdummy" up
run_cmd kci_test_encap_vxlan "$testns" run_cmd kci_test_encap_vxlan
run_cmd kci_test_encap_fou "$testns" run_cmd kci_test_encap_fou
ip netns del "$testns" ip netns del "$testns"
return $ret return $ret
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment