Skip to content

Commit 4948db9

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: join: endpoints: longer transfer
[ Upstream commit 6457595 ] 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> [ removed curly braces and stderr redirection ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 378e613 commit 4948db9

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
@@ -3741,7 +3741,7 @@ endpoint_tests()
37413741
pm_nl_set_limits $ns1 2 2
37423742
pm_nl_set_limits $ns2 2 2
37433743
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3744-
speed=slow \
3744+
test_linkfail=128 speed=slow \
37453745
run_tests $ns1 $ns2 10.0.1.1 &
37463746
local tests_pid=$!
37473747

@@ -3768,7 +3768,7 @@ endpoint_tests()
37683768
pm_nl_set_limits $ns2 0 3
37693769
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
37703770
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3771-
test_linkfail=4 speed=5 \
3771+
test_linkfail=128 speed=5 \
37723772
run_tests $ns1 $ns2 10.0.1.1 &
37733773
local tests_pid=$!
37743774

@@ -3845,7 +3845,7 @@ endpoint_tests()
38453845
# broadcast IP: no packet for this address will be received on ns1
38463846
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
38473847
pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
3848-
test_linkfail=4 speed=5 \
3848+
test_linkfail=128 speed=5 \
38493849
run_tests $ns1 $ns2 10.0.1.1 &
38503850
local tests_pid=$!
38513851

@@ -3917,7 +3917,7 @@ endpoint_tests()
39173917
# broadcast IP: no packet for this address will be received on ns1
39183918
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
39193919
pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
3920-
test_linkfail=4 speed=20 \
3920+
test_linkfail=128 speed=20 \
39213921
run_tests $ns1 $ns2 10.0.1.1 &
39223922
local tests_pid=$!
39233923

0 commit comments

Comments
 (0)