Do some cleanups.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 25 +++++++------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index f568c71884c7..168426798971 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2553,7 +2553,7 @@ verify_listener_events()
sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q')
sport=$(grep "type:$e_type," $evt |
sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')
- if [ $family = $AF_INET6 ]; then
+ if [ $family ] && [ $family = $AF_INET6 ]; then
saddr=$(grep "type:$e_type," $evt |
sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')
else
@@ -2561,11 +2561,14 @@ verify_listener_events()
sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q')
fi
- if [ $type = $e_type ] && [ $family = $e_family ] &&
- [ $saddr = $e_saddr ] && [ $sport = $e_sport ]; then
+ if [ $type ] && [ $type = $e_type ] &&
+ [ $family ] && [ $family = $e_family ] &&
+ [ $saddr ] && [ $saddr = $e_saddr ] &&
+ [ $sport ] && [ $sport = $e_sport ]; then
stdbuf -o0 -e0 printf "[ ok ]\n"
return 0
fi
+ fail_test
stdbuf -o0 -e0 printf "[fail]\n"
}
@@ -2594,15 +2597,7 @@ add_addr_ports_tests()
# single address with port, remove
# pm listener events
- if reset "remove single address with port"; then
- local evts
- local pid
-
- evts=$(mktemp)
- :> $evts
- ip netns exec $ns1 ./pm_nl_ctl events >> $evts 2>&1 &
- pid=$!
-
+ if reset_with_events "remove single address with port"; then
pm_nl_set_limits $ns1 0 1
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100
pm_nl_set_limits $ns2 1 1
@@ -2611,10 +2606,8 @@ add_addr_ports_tests()
chk_add_nr 1 1 1
chk_rm_nr 1 1 invert
- verify_listener_events $evts 15 $AF_INET 10.0.2.1 10100
- verify_listener_events $evts 16 $AF_INET 10.0.2.1 10100
- kill_wait $pid
- rm -rf $evts
+ verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 10100
+ verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100
fi
# subflow and signal with port, remove
--
2.35.3