Skip to content

Commit 6457595

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: endpoints: 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 endpoints tests not waiting for the end of the transfer are now sharing a longer file (128KB) at slow speed. Fixes: 69c6ce7 ("selftests: mptcp: add implicit endpoint test case") Cc: stable@vger.kernel.org Fixes: e274f71 ("selftests: mptcp: add subflow limits test-cases") Fixes: b5e2fb8 ("selftests: mptcp: add explicit test case for remove/readd") Fixes: e06959e ("selftests: mptcp: join: test for flush/re-add endpoints") 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-3-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent aea73ba commit 6457595

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,7 +3943,7 @@ endpoint_tests()
39433943
pm_nl_set_limits $ns1 2 2
39443944
pm_nl_set_limits $ns2 2 2
39453945
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3946-
{ speed=slow \
3946+
{ test_linkfail=128 speed=slow \
39473947
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39483948
local tests_pid=$!
39493949

@@ -3970,7 +3970,7 @@ endpoint_tests()
39703970
pm_nl_set_limits $ns2 0 3
39713971
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
39723972
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3973-
{ test_linkfail=4 speed=5 \
3973+
{ test_linkfail=128 speed=5 \
39743974
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39753975
local tests_pid=$!
39763976

@@ -4048,7 +4048,7 @@ endpoint_tests()
40484048
# broadcast IP: no packet for this address will be received on ns1
40494049
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
40504050
pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
4051-
{ test_linkfail=4 speed=5 \
4051+
{ test_linkfail=128 speed=5 \
40524052
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
40534053
local tests_pid=$!
40544054

@@ -4121,7 +4121,7 @@ endpoint_tests()
41214121
# broadcast IP: no packet for this address will be received on ns1
41224122
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
41234123
pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
4124-
{ test_linkfail=4 speed=20 \
4124+
{ test_linkfail=128 speed=20 \
41254125
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
41264126
local tests_pid=$!
41274127

0 commit comments

Comments
 (0)