Skip to content

Commit a635a8c

Browse files
Paolo Abenidavem330
authored andcommitted
selftests: mptcp: allow more slack for slow test-case
A test-case is frequently failing on some extremely slow VMs. The mptcp transfer completes before the script is able to do all the required PM manipulation. Address the issue in the simplest possible way, making the transfer even more slow. Additionally dump more info in case of failures, to help debugging similar problems in the future and init dump_stats var. Fixes: e274f71 ("selftests: mptcp: add subflow limits test-cases") Cc: [email protected] Closes: multipath-tcp/mptcp_net-next#323 Signed-off-by: Paolo Abeni <[email protected]> Reviewed-by: Matthieu Baerts <[email protected]> Signed-off-by: Matthieu Baerts <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1249db4 commit a635a8c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,7 @@ chk_subflow_nr()
16941694
local subflow_nr=$3
16951695
local cnt1
16961696
local cnt2
1697+
local dump_stats
16971698

16981699
if [ -n "${need_title}" ]; then
16991700
printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "${msg}"
@@ -1711,7 +1712,12 @@ chk_subflow_nr()
17111712
echo "[ ok ]"
17121713
fi
17131714

1714-
[ "${dump_stats}" = 1 ] && ( ss -N $ns1 -tOni ; ss -N $ns1 -tOni | grep token; ip -n $ns1 mptcp endpoint )
1715+
if [ "${dump_stats}" = 1 ]; then
1716+
ss -N $ns1 -tOni
1717+
ss -N $ns1 -tOni | grep token
1718+
ip -n $ns1 mptcp endpoint
1719+
dump_stats
1720+
fi
17151721
}
17161722

17171723
chk_link_usage()
@@ -3069,7 +3075,7 @@ endpoint_tests()
30693075
pm_nl_set_limits $ns1 1 1
30703076
pm_nl_set_limits $ns2 1 1
30713077
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3072-
run_tests $ns1 $ns2 10.0.1.1 4 0 0 slow &
3078+
run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 &
30733079

30743080
wait_mpj $ns2
30753081
pm_nl_del_endpoint $ns2 2 10.0.2.2

0 commit comments

Comments
 (0)