selftests: mptcp: wait for port instead of sleep

After having started mptcp_connect in listening mode,
'mptcp_lib_wait_local_port_listen' can be used to wait for the listening
socket to be ready.

This is better than using the 'sleep' command, not to pause for a fixed
amount of time, but waiting for an event. This helper is used in all
other MPTCP selftests, but not in these two.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251114-net-next-mptcp-sft-count-cache-stats-timeout-v1-7-863cb04e1b7b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 42d533b95ec752eee9f8bdcbf9388d953a74a27a..6cde7429104b95b5b7f51c68f484403967a3a925 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -178,7 +178,7 @@ do_transfer()
                                ${local_addr} < "$sin" > "$sout" &
        local spid=$!
 
-       sleep 1
+       mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}"
 
        timeout ${timeout_test} \
                ip netns exec ${connector_ns} \

diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 87323942cb8a0779717e6c0cb6be46314d303d26..e9ae1806ab071996a22fb811ccd398c299b7b8c0 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -211,7 +211,8 @@ make_connection()
        ip netns exec "$ns1" \
           ./mptcp_connect -s MPTCP -w 300 -p $app_port -l $listen_addr > /dev/null 2>&1 &
        local server_pid=$!
-       sleep 0.5
+
+       mptcp_lib_wait_local_port_listen "${ns1}" "${port}"
 
        # Run the client, transfer $file and stay connected to the server
        # to conduct tests