Skip to content

Commit 2904930

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: userspace: longer transfer
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: stable@vger.kernel.org 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 <geliang@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-4-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 6457595 commit 2904930

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
@@ -3806,7 +3806,7 @@ userspace_tests()
38063806
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
38073807
set_userspace_pm $ns1
38083808
pm_nl_set_limits $ns2 2 2
3809-
{ speed=5 \
3809+
{ test_linkfail=128 speed=5 \
38103810
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38113811
local tests_pid=$!
38123812
wait_mpj $ns1
@@ -3839,7 +3839,7 @@ userspace_tests()
38393839
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
38403840
set_userspace_pm $ns2
38413841
pm_nl_set_limits $ns1 0 1
3842-
{ speed=5 \
3842+
{ test_linkfail=128 speed=5 \
38433843
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38443844
local tests_pid=$!
38453845
wait_mpj $ns2
@@ -3867,7 +3867,7 @@ userspace_tests()
38673867
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
38683868
set_userspace_pm $ns2
38693869
pm_nl_set_limits $ns1 0 1
3870-
{ speed=5 \
3870+
{ test_linkfail=128 speed=5 \
38713871
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38723872
local tests_pid=$!
38733873
wait_mpj $ns2
@@ -3888,7 +3888,7 @@ userspace_tests()
38883888
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
38893889
set_userspace_pm $ns2
38903890
pm_nl_set_limits $ns1 0 1
3891-
{ speed=5 \
3891+
{ test_linkfail=128 speed=5 \
38923892
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38933893
local tests_pid=$!
38943894
wait_mpj $ns2
@@ -3912,7 +3912,7 @@ userspace_tests()
39123912
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
39133913
set_userspace_pm $ns1
39143914
pm_nl_set_limits $ns2 1 1
3915-
{ speed=5 \
3915+
{ test_linkfail=128 speed=5 \
39163916
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39173917
local tests_pid=$!
39183918
wait_mpj $ns1

0 commit comments

Comments
 (0)