Skip to content

Commit

Permalink
selftests: mptcp: join: simplify v4mapped_tests
Browse files Browse the repository at this point in the history
Some selftests for mptcp are very similar, only one or two lines are
different. So it's very suitable to use a for-loop to simplify and merge
these tests. This patch picks the 26 most similar tests from two pairs
for simplifying and merging.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
  • Loading branch information
geliangtang authored and Geliang Tang committed May 7, 2024
1 parent cccbfff commit 602ceeb
Showing 1 changed file with 10 additions and 15 deletions.
25 changes: 10 additions & 15 deletions tools/testing/selftests/net/mptcp/mptcp_join.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2520,22 +2520,17 @@ v4mapped_tests()
fi

# no subflow IPv6 to v4 address
if reset "no JOIN with diff families v4-v6"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0
fi

# no subflow IPv6 to v4 address even if v6 has a valid v4 at the end
if reset "no JOIN with diff families v4-v6-2"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0
fi
local addr i
for addr in "2" "10.0.3.2"; do
if reset "no JOIN with diff families v4-v6-$((++i))"; then
pm_nl_set_limits $ns1 0 1
pm_nl_set_limits $ns2 0 1
pm_nl_add_endpoint $ns2 dead:beef:2::$addr flags subflow
run_tests $ns1 $ns2 10.0.1.1
chk_join_nr 0 0 0
fi
done

# no subflow IPv4 to v6 address, no need to slow down too then
if reset "no JOIN with diff families v6-v4"; then
Expand Down

0 comments on commit 602ceeb

Please sign in to comment.