selftests: mptcp: print_test out of verify_listener_events

verify_listener_events() helper will be exported into mptcp_lib.sh as a
public function, but print_test() is invoked in it, which is a private
function in userspace_pm.sh only. So this patch moves print_test() out of
verify_listener_events().

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-12-4f42c347b653@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 6d0862a1b68da55eb919f0d44890ba915f9ceb1c..e9aea44edee5df6415e4cc673a8289b726ba6007 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -845,12 +845,6 @@ verify_listener_events()
        local saddr
        local sport
 
-       if [ $e_type = $LISTENER_CREATED ]; then
-               print_test "CREATE_LISTENER $e_saddr:$e_sport"
-       elif [ $e_type = $LISTENER_CLOSED ]; then
-               print_test "CLOSE_LISTENER $e_saddr:$e_sport"
-       fi
-
        type=$(mptcp_lib_evts_get_info type $evt $e_type)
        family=$(mptcp_lib_evts_get_info family $evt $e_type)
        sport=$(mptcp_lib_evts_get_info sport $evt $e_type)
@@ -882,6 +876,7 @@ test_listener()
        local listener_pid=$!
 
        sleep 0.5
+       print_test "CREATE_LISTENER 10.0.2.2:$client4_port"
        verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $client4_port
 
        # ADD_ADDR from client to server machine reusing the subflow port
@@ -898,6 +893,7 @@ test_listener()
        mptcp_lib_kill_wait $listener_pid
 
        sleep 0.5
+       print_test "CLOSE_LISTENER 10.0.2.2:$client4_port"
        verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $client4_port
 }