Commit 0e4ec14d authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

selftests: mptcp: join: userspace: longer timeout 



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 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 userspace 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: 29049307 ("selftests: mptcp: join: userspace: longer transfer")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Link: https://patch.msgid.link/20251118-net-mptcp-misc-fixes-6-18-rc6-v1-9-806d3781c95f@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fb13c6bb

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

+5 −5
Original line number Diff line number Diff line
@@ -3804,7 +3804,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns1

		pm_nl_set_limits $ns2 2 2

		{ test_linkfail=128 speed=5 \

		{ timeout_test=120 test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns1
@@ -3837,7 +3837,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ test_linkfail=128 speed=5 \

		{ timeout_test=120 test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3865,7 +3865,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ test_linkfail=128 speed=5 \

		{ timeout_test=120 test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3886,7 +3886,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ test_linkfail=128 speed=5 \

		{ timeout_test=120 test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3910,7 +3910,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns1

		pm_nl_set_limits $ns2 1 1

		{ test_linkfail=128 speed=5 \

		{ timeout_test=120 test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns1