Skip to content

Commit 8ebb441

Browse files
Geliang Tangkuba-moo
authored andcommitted
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 <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-12-4f42c347b653@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 663260e commit 8ebb441

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,6 @@ verify_listener_events()
845845
local saddr
846846
local sport
847847

848-
if [ $e_type = $LISTENER_CREATED ]; then
849-
print_test "CREATE_LISTENER $e_saddr:$e_sport"
850-
elif [ $e_type = $LISTENER_CLOSED ]; then
851-
print_test "CLOSE_LISTENER $e_saddr:$e_sport"
852-
fi
853-
854848
type=$(mptcp_lib_evts_get_info type $evt $e_type)
855849
family=$(mptcp_lib_evts_get_info family $evt $e_type)
856850
sport=$(mptcp_lib_evts_get_info sport $evt $e_type)
@@ -882,6 +876,7 @@ test_listener()
882876
local listener_pid=$!
883877

884878
sleep 0.5
879+
print_test "CREATE_LISTENER 10.0.2.2:$client4_port"
885880
verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $client4_port
886881

887882
# ADD_ADDR from client to server machine reusing the subflow port
@@ -898,6 +893,7 @@ test_listener()
898893
mptcp_lib_kill_wait $listener_pid
899894

900895
sleep 0.5
896+
print_test "CLOSE_LISTENER 10.0.2.2:$client4_port"
901897
verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $client4_port
902898
}
903899

0 commit comments

Comments
 (0)