Skip to content

Commit 7558cf8

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: join: endpoints: longer transfer
commit 6457595db9870298ee30b6d75287b8548e33fe19 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 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: [email protected] 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 <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-3-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 927bb57 commit 7558cf8

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
@@ -3757,7 +3757,7 @@ endpoint_tests()
37573757
pm_nl_set_limits $ns1 2 2
37583758
pm_nl_set_limits $ns2 2 2
37593759
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3760-
{ speed=slow \
3760+
{ test_linkfail=128 speed=slow \
37613761
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37623762
local tests_pid=$!
37633763

@@ -3784,7 +3784,7 @@ endpoint_tests()
37843784
pm_nl_set_limits $ns2 0 3
37853785
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
37863786
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3787-
{ test_linkfail=4 speed=5 \
3787+
{ test_linkfail=128 speed=5 \
37883788
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37893789
local tests_pid=$!
37903790

@@ -3862,7 +3862,7 @@ endpoint_tests()
38623862
# broadcast IP: no packet for this address will be received on ns1
38633863
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
38643864
pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
3865-
{ test_linkfail=4 speed=5 \
3865+
{ test_linkfail=128 speed=5 \
38663866
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38673867
local tests_pid=$!
38683868

@@ -3935,7 +3935,7 @@ endpoint_tests()
39353935
# broadcast IP: no packet for this address will be received on ns1
39363936
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
39373937
pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
3938-
{ test_linkfail=4 speed=20 \
3938+
{ test_linkfail=128 speed=20 \
39393939
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39403940
local tests_pid=$!
39413941

0 commit comments

Comments
 (0)