Skip to content

Commit e9ce7ed

Browse files
NicolasDichtelkuba-moo
authored andcommitted
selftests: rtnetlink: use setup_ns in bonding test
This is a follow-up of commit a159cbe ("selftests: rtnetlink: check enslaving iface in a bond") after the merge of net-next into net. The goal is to follow the new convention, see commit d3b6b11 ("selftests/net: convert rtnetlink.sh to run it in unique namespace") for more details. Let's use also the generic dummy name instead of defining a new one. Signed-off-by: Nicolas Dichtel <[email protected]> Reviewed-by: Hangbin Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 97eb5d5 commit e9ce7ed

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

tools/testing/selftests/net/rtnetlink.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,21 +1244,19 @@ kci_test_address_proto()
12441244

12451245
kci_test_enslave_bonding()
12461246
{
1247-
local testns="testns"
12481247
local bond="bond123"
1249-
local dummy="dummy123"
12501248
local ret=0
12511249

1252-
run_cmd ip netns add "$testns"
1253-
if [ $ret -ne 0 ]; then
1250+
setup_ns testns
1251+
if [ $? -ne 0 ]; then
12541252
end_test "SKIP bonding tests: cannot add net namespace $testns"
12551253
return $ksft_skip
12561254
fi
12571255

12581256
run_cmd ip -netns $testns link add dev $bond type bond mode balance-rr
1259-
run_cmd ip -netns $testns link add dev $dummy type dummy
1260-
run_cmd ip -netns $testns link set dev $dummy up
1261-
run_cmd ip -netns $testns link set dev $dummy master $bond down
1257+
run_cmd ip -netns $testns link add dev $devdummy type dummy
1258+
run_cmd ip -netns $testns link set dev $devdummy up
1259+
run_cmd ip -netns $testns link set dev $devdummy master $bond down
12621260
if [ $ret -ne 0 ]; then
12631261
end_test "FAIL: initially up interface added to a bond and set down"
12641262
ip netns del "$testns"

0 commit comments

Comments
 (0)