Skip to content

Commit fb13c6b

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: endpoints: longer timeout
In rare cases, when the test environment is very slow, some endpoints 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 have a longer timeout, and even go over the default one. This connection will be killed at the end, after the verifications: increasing the timeout doesn't change anything, apart from avoiding 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 having a longer timeout: 2 minutes. The Fixes commit was making the connection longer, but still, the default timeout would have stopped it after 1 minute, which might not be enough in very slow environments. Fixes: 6457595 ("selftests: mptcp: join: endpoints: longer transfer") Cc: stable@vger.kernel.org Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Reviewed-by: Geliang Tang <geliang@kernel.org> Link: https://patch.msgid.link/20251118-net-mptcp-misc-fixes-6-18-rc6-v1-8-806d3781c95f@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent efff6cd commit fb13c6b

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
@@ -3941,7 +3941,7 @@ endpoint_tests()
39413941
pm_nl_set_limits $ns1 2 2
39423942
pm_nl_set_limits $ns2 2 2
39433943
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3944-
{ test_linkfail=128 speed=slow \
3944+
{ timeout_test=120 test_linkfail=128 speed=slow \
39453945
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39463946
local tests_pid=$!
39473947

@@ -3968,7 +3968,7 @@ endpoint_tests()
39683968
pm_nl_set_limits $ns2 0 3
39693969
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
39703970
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3971-
{ test_linkfail=128 speed=5 \
3971+
{ timeout_test=120 test_linkfail=128 speed=5 \
39723972
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39733973
local tests_pid=$!
39743974

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

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

0 commit comments

Comments
 (0)