Skip to content

Commit acc03eb

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: join: userspace: longer transfer
commit 290493078b96ce2ce3e60f55c23654acb678042a upstream. In rare cases, when the test environment is very slow, some userspace tests can fail because some expected events have not been seen. Because the tests are expecting a long on-going connection, and they are not waiting for the end of the transfer, it is fine to make the connection longer. This connection will be killed at the end, after the verifications, so making it longer doesn't change anything, apart from avoid it to end before the end of the verifications To play it safe, all userspace tests not waiting for the end of the transfer are now sharing a longer file (128KB) at slow speed. Fixes: 4369c19 ("selftests: mptcp: test userspace pm out of transfer") Cc: [email protected] Fixes: b2e2248 ("selftests: mptcp: userspace pm create id 0 subflow") Fixes: e3b47e4 ("selftests: mptcp: userspace pm remove initial subflow") Fixes: b9fb176 ("selftests: mptcp: userspace pm send RM_ADDR for ID 0") Reviewed-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-4-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4dfd3e5 commit acc03eb

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,7 +3620,7 @@ userspace_tests()
36203620
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36213621
set_userspace_pm $ns1
36223622
pm_nl_set_limits $ns2 2 2
3623-
{ speed=5 \
3623+
{ test_linkfail=128 speed=5 \
36243624
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36253625
local tests_pid=$!
36263626
wait_mpj $ns1
@@ -3653,7 +3653,7 @@ userspace_tests()
36533653
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36543654
set_userspace_pm $ns2
36553655
pm_nl_set_limits $ns1 0 1
3656-
{ speed=5 \
3656+
{ test_linkfail=128 speed=5 \
36573657
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36583658
local tests_pid=$!
36593659
wait_mpj $ns2
@@ -3681,7 +3681,7 @@ userspace_tests()
36813681
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36823682
set_userspace_pm $ns2
36833683
pm_nl_set_limits $ns1 0 1
3684-
{ speed=5 \
3684+
{ test_linkfail=128 speed=5 \
36853685
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36863686
local tests_pid=$!
36873687
wait_mpj $ns2
@@ -3702,7 +3702,7 @@ userspace_tests()
37023702
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
37033703
set_userspace_pm $ns2
37043704
pm_nl_set_limits $ns1 0 1
3705-
{ speed=5 \
3705+
{ test_linkfail=128 speed=5 \
37063706
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37073707
local tests_pid=$!
37083708
wait_mpj $ns2
@@ -3726,7 +3726,7 @@ userspace_tests()
37263726
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
37273727
set_userspace_pm $ns1
37283728
pm_nl_set_limits $ns2 1 1
3729-
{ speed=5 \
3729+
{ test_linkfail=128 speed=5 \
37303730
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37313731
local tests_pid=$!
37323732
wait_mpj $ns1

0 commit comments

Comments
 (0)