[PATCH 6.6 215/529] selftests: net: replace sleeps in fcnal-test with waits

21 Nov 2025

6.6-stable review patch.  If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski kuba@kernel.org
[ Upstream commit 15c068cb214d74a2faca9293b25f454242d0d65e ]
fcnal-test.sh already includes lib.sh, use relevant helpers
instead of sleeping. Replace sleep after starting nettest
as a server with wait_local_port_listen.
Reviewed-by: David Ahern dsahern@kernel.org
Link: https://patch.msgid.link/20250909223837.863217-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski kuba@kernel.org
Signed-off-by: Sasha Levin sashal@kernel.org
---
 tools/testing/selftests/net/fcnal-test.sh | 428 +++++++++++-----------
 1 file changed, 214 insertions(+), 214 deletions(-)

diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh
index d32a14ba069ac..5726975975c14 100755
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@ -865,7 +865,7 @@ ipv4_tcp_md5_novrf()
    # basic use case
    log_start
    run_cmd nettest -s -M ${MD5_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: Single address config"
@@ -873,7 +873,7 @@ ipv4_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: Server no config, client uses password"
@@ -881,7 +881,7 @@ ipv4_tcp_md5_novrf()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -s -M ${MD5_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: Client uses wrong password"
@@ -889,7 +889,7 @@ ipv4_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -s -M ${MD5_PW} -m ${NSB_LO_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: Client address does not match address configured with password"
@@ -900,7 +900,7 @@ ipv4_tcp_md5_novrf()
    # client in prefix
    log_start
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: Prefix config"
@@ -908,7 +908,7 @@ ipv4_tcp_md5_novrf()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: Prefix config, client uses wrong password"
@@ -916,7 +916,7 @@ ipv4_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -c ${NSB_LO_IP} -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: Prefix config, client address not in configured prefix"
 }
@@ -933,7 +933,7 @@ ipv4_tcp_md5()
    # basic use case
    log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Single address config"
@@ -941,7 +941,7 @@ ipv4_tcp_md5()
    log_start
    show_hint "Should timeout since server does not have MD5 auth"
    run_cmd nettest -s -I ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Server no config, client uses password"
@@ -949,7 +949,7 @@ ipv4_tcp_md5()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Client uses wrong password"
@@ -957,7 +957,7 @@ ipv4_tcp_md5()
    log_start
    show_hint "Should timeout since server config differs from client"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_LO_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Client address does not match address configured with password"
@@ -968,7 +968,7 @@ ipv4_tcp_md5()
    # client in prefix
    log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Prefix config"
@@ -976,7 +976,7 @@ ipv4_tcp_md5()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password"
@@ -984,7 +984,7 @@ ipv4_tcp_md5()
    log_start
    show_hint "Should timeout since client address is outside of prefix"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -c ${NSB_LO_IP} -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix"
@@ -995,14 +995,14 @@ ipv4_tcp_md5()
    log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF"
log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest  -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF"
@@ -1010,7 +1010,7 @@ ipv4_tcp_md5()
    show_hint "Should timeout since client in default VRF uses VRF password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw"
@@ -1018,21 +1018,21 @@ ipv4_tcp_md5()
    show_hint "Should timeout since client in VRF uses default VRF password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NSB_IP} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw"
log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest  -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF"
log_start
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest  -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF"
@@ -1040,7 +1040,7 @@ ipv4_tcp_md5()
    show_hint "Should timeout since client in default VRF uses VRF password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw"
@@ -1048,7 +1048,7 @@ ipv4_tcp_md5()
    show_hint "Should timeout since client in VRF uses default VRF password"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} &
    run_cmd nettest -s -M ${MD5_WRONG_PW} -m ${NS_NET} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw"
@@ -1072,14 +1072,14 @@ test_ipv4_md5_vrf__vrf_server__no_bind_ifindex()
    log_start
    show_hint "Simulates applications using VRF without TCP_MD5SIG_FLAG_IFINDEX"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} --no-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: VRF-bound server, unbound key accepts connection"
log_start
    show_hint "Binding both the socket and the key is not required but it works"
    run_cmd nettest -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET} --force-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: VRF-bound server, bound key accepts connection"
 }
@@ -1093,25 +1093,25 @@ test_ipv4_md5_vrf__global_server__bind_ifindex0()
log_start
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} --force-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Global server, Key bound to ifindex=0 rejects VRF connection"
log_start
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} --force-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Global server, key bound to ifindex=0 accepts non-VRF connection"
    log_start
run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} --no-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Global server, key not bound to ifindex accepts VRF connection"
log_start
    run_cmd nettest -s -M ${MD5_PW} -m ${NS_NET} --no-bind-key-ifindex &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -r ${NSA_IP} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Global server, key not bound to ifindex accepts non-VRF connection"
@@ -1183,7 +1183,7 @@ ipv4_tcp_novrf()
    do
    	log_start
    	run_cmd nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
    done
@@ -1191,7 +1191,7 @@ ipv4_tcp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -I ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${a}
    log_test_addr ${a} $? 0 "Device server"
@@ -1211,13 +1211,13 @@ ipv4_tcp_novrf()
    do
    	log_start
    	run_cmd_nsb nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -r ${a} -0 ${NSA_IP}
    	log_test_addr ${a} $? 0 "Client"
log_start
    	run_cmd_nsb nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 0 "Client, device bind"
@@ -1239,7 +1239,7 @@ ipv4_tcp_novrf()
    do
    	log_start
    	run_cmd nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -r ${a} -0 ${a} -1 ${a}
    	log_test_addr ${a} $? 0 "Global server, local connection"
    done
@@ -1247,7 +1247,7 @@ ipv4_tcp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -I ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, unbound client, local connection"
@@ -1256,7 +1256,7 @@ ipv4_tcp_novrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since addresses on loopback are out of device scope"
    	run_cmd nettest -s -I ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -r ${a}
    	log_test_addr ${a} $? 1 "Device server, unbound client, local connection"
    done
@@ -1264,7 +1264,7 @@ ipv4_tcp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -0 ${a} -d ${NSA_DEV}
    log_test_addr ${a} $? 0 "Global server, device client, local connection"
@@ -1273,7 +1273,7 @@ ipv4_tcp_novrf()
    	log_start
    	show_hint "Should fail 'No route to host' since addresses on loopback are out of device scope"
    	run_cmd nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 1 "Global server, device client, local connection"
    done
@@ -1281,7 +1281,7 @@ ipv4_tcp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest  -d ${NSA_DEV} -r ${a} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, device client, local connection"
@@ -1313,19 +1313,19 @@ ipv4_tcp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since global server with VRF is disabled"
    	run_cmd nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 1 "Global server"
log_start
    	run_cmd nettest -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
log_start
    	run_cmd nettest -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 0 "Device server"
@@ -1342,7 +1342,7 @@ ipv4_tcp_vrf()
    log_start
    show_hint "Should fail 'Connection refused' since global server with VRF is disabled"
    run_cmd nettest -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -d ${NSA_DEV}
    log_test_addr ${a} $? 1 "Global server, local connection"
@@ -1364,14 +1364,14 @@ ipv4_tcp_vrf()
    	log_start
    	show_hint "client socket should be bound to VRF"
    	run_cmd nettest -s -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
log_start
    	show_hint "client socket should be bound to VRF"
    	run_cmd nettest -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
@@ -1386,7 +1386,7 @@ ipv4_tcp_vrf()
    log_start
    show_hint "client socket should be bound to device"
    run_cmd nettest -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -r ${a}
    log_test_addr ${a} $? 0 "Device server"
@@ -1396,7 +1396,7 @@ ipv4_tcp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since client is not bound to VRF"
    	run_cmd nettest -s -I ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -r ${a}
    	log_test_addr ${a} $? 1 "Global server, local connection"
    done
@@ -1408,13 +1408,13 @@ ipv4_tcp_vrf()
    do
    	log_start
    	run_cmd_nsb nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -r ${a} -d ${VRF}
    	log_test_addr ${a} $? 0 "Client, VRF bind"
log_start
    	run_cmd_nsb nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 0 "Client, device bind"
@@ -1433,7 +1433,7 @@ ipv4_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -r ${a} -d ${VRF} -0 ${a}
    	log_test_addr ${a} $? 0 "VRF server, VRF client, local connection"
    done
@@ -1441,26 +1441,26 @@ ipv4_tcp_vrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -I ${VRF} -3 ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -d ${NSA_DEV} -0 ${a}
    log_test_addr ${a} $? 0 "VRF server, device client, local connection"
log_start
    show_hint "Should fail 'No route to host' since client is out of VRF scope"
    run_cmd nettest -s -I ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a}
    log_test_addr ${a} $? 1 "VRF server, unbound client, local connection"
log_start
    run_cmd nettest -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -d ${VRF} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, VRF client, local connection"
log_start
    run_cmd nettest -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -r ${a} -d ${NSA_DEV} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, device client, local connection"
 }
@@ -1499,7 +1499,7 @@ ipv4_udp_novrf()
    do
    	log_start
    	run_cmd nettest -D -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
@@ -1512,7 +1512,7 @@ ipv4_udp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd_nsb nettest -D -r ${a}
    log_test_addr ${a} $? 0 "Device server"
@@ -1523,31 +1523,31 @@ ipv4_udp_novrf()
    do
    	log_start
    	run_cmd_nsb nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -D -r ${a} -0 ${NSA_IP}
    	log_test_addr ${a} $? 0 "Client"
log_start
    	run_cmd_nsb nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -0 ${NSA_IP}
    	log_test_addr ${a} $? 0 "Client, device bind"
log_start
    	run_cmd_nsb nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -C -0 ${NSA_IP}
    	log_test_addr ${a} $? 0 "Client, device send via cmsg"
log_start
    	run_cmd_nsb nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -S -0 ${NSA_IP}
    	log_test_addr ${a} $? 0 "Client, device bind via IP_UNICAST_IF"
log_start
    	run_cmd_nsb nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -S -0 ${NSA_IP} -U
    	log_test_addr ${a} $? 0 "Client, device bind via IP_UNICAST_IF, with connect()"
@@ -1570,7 +1570,7 @@ ipv4_udp_novrf()
    do
    	log_start
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a} -0 ${a} -1 ${a}
    	log_test_addr ${a} $? 0 "Global server, local connection"
    done
@@ -1578,7 +1578,7 @@ ipv4_udp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -r ${a}
    log_test_addr ${a} $? 0 "Device server, unbound client, local connection"
@@ -1587,7 +1587,7 @@ ipv4_udp_novrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since address is out of device scope"
    	run_cmd nettest -s -D -I ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a}
    	log_test_addr ${a} $? 1 "Device server, unbound client, local connection"
    done
@@ -1595,25 +1595,25 @@ ipv4_udp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Global server, device client, local connection"
log_start
    run_cmd nettest -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -C -r ${a}
    log_test_addr ${a} $? 0 "Global server, device send via cmsg, local connection"
log_start
    run_cmd nettest -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -S -r ${a}
    log_test_addr ${a} $? 0 "Global server, device client via IP_UNICAST_IF, local connection"
log_start
    run_cmd nettest -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -S -r ${a} -U
    log_test_addr ${a} $? 0 "Global server, device client via IP_UNICAST_IF, local connection, with connect()"
@@ -1626,28 +1626,28 @@ ipv4_udp_novrf()
    	log_start
    	show_hint "Should fail since addresses on loopback are out of device scope"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 2 "Global server, device client, local connection"
log_start
    	show_hint "Should fail since addresses on loopback are out of device scope"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -C
    	log_test_addr ${a} $? 1 "Global server, device send via cmsg, local connection"
log_start
    	show_hint "Should fail since addresses on loopback are out of device scope"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -S
    	log_test_addr ${a} $? 1 "Global server, device client via IP_UNICAST_IF, local connection"
log_start
    	show_hint "Should fail since addresses on loopback are out of device scope"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -r ${a} -d ${NSA_DEV} -S -U
    	log_test_addr ${a} $? 1 "Global server, device client via IP_UNICAST_IF, local connection, with connect()"
@@ -1657,7 +1657,7 @@ ipv4_udp_novrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -D -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, device client, local conn"
@@ -1699,19 +1699,19 @@ ipv4_udp_vrf()
    	log_start
    	show_hint "Fails because ingress is in a VRF and global server is disabled"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 1 "Global server"
log_start
    	run_cmd nettest -D -I ${VRF} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
log_start
    	run_cmd nettest -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "Enslaved device server"
@@ -1723,7 +1723,7 @@ ipv4_udp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since global server is out of scope"
    	run_cmd nettest -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -d ${VRF} -r ${a}
    	log_test_addr ${a} $? 1 "Global server, VRF client, local connection"
    done
@@ -1731,26 +1731,26 @@ ipv4_udp_vrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -s -D -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
log_start
    run_cmd nettest -s -D -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, enslaved device client, local connection"
a=${NSA_IP}
    log_start
    run_cmd nettest -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, VRF client, local conn"
log_start
    run_cmd nettest -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, device client, local conn"
@@ -1765,19 +1765,19 @@ ipv4_udp_vrf()
    do
    	log_start
    	run_cmd nettest -D -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
log_start
    	run_cmd nettest -D -I ${VRF} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
log_start
    	run_cmd nettest -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -D -r ${a}
    	log_test_addr ${a} $? 0 "Enslaved device server"
@@ -1792,13 +1792,13 @@ ipv4_udp_vrf()
    #
    log_start
    run_cmd_nsb nettest -D -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 udp
    run_cmd nettest -d ${VRF} -D -r ${NSB_IP} -1 ${NSA_IP}
    log_test $? 0 "VRF client"
log_start
    run_cmd_nsb nettest -D -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 udp
    run_cmd nettest -d ${NSA_DEV} -D -r ${NSB_IP} -1 ${NSA_IP}
    log_test $? 0 "Enslaved device client"
@@ -1819,31 +1819,31 @@ ipv4_udp_vrf()
    a=${NSA_IP}
    log_start
    run_cmd nettest -D -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Global server, VRF client, local conn"
log_start
    run_cmd nettest -s -D -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
log_start
    run_cmd nettest -s -D -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, device client, local conn"
log_start
    run_cmd nettest -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, VRF client, local conn"
log_start
    run_cmd nettest -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, device client, local conn"
@@ -1851,7 +1851,7 @@ ipv4_udp_vrf()
    do
    	log_start
    	run_cmd nettest -D -s -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -d ${VRF} -r ${a}
    	log_test_addr ${a} $? 0 "Global server, VRF client, local conn"
    done
@@ -1860,7 +1860,7 @@ ipv4_udp_vrf()
    do
    	log_start
    	run_cmd nettest -s -D -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -D -d ${VRF} -r ${a}
    	log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
    done
@@ -2083,7 +2083,7 @@ ipv4_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${varg} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -2097,7 +2097,7 @@ ipv4_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -s -I ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${varg} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -2110,7 +2110,7 @@ ipv4_rt()
    a=${NSA_IP}
    log_start
    run_cmd nettest ${varg} -s -I ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest ${varg} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2124,7 +2124,7 @@ ipv4_rt()
    #
    log_start
    run_cmd_nsb nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 tcp
    run_cmd nettest ${varg} -d ${VRF} -r ${NSB_IP} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2135,7 +2135,7 @@ ipv4_rt()
log_start
    run_cmd_nsb nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${NSB_IP} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2151,7 +2151,7 @@ ipv4_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest ${varg} -d ${VRF} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -2165,7 +2165,7 @@ ipv4_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -I ${VRF} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest ${varg} -d ${VRF} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -2179,7 +2179,7 @@ ipv4_rt()
    log_start
run_cmd nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2190,7 +2190,7 @@ ipv4_rt()
log_start
    run_cmd nettest ${varg} -I ${VRF} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2201,7 +2201,7 @@ ipv4_rt()
log_start
    run_cmd nettest ${varg} -I ${NSA_DEV} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -2551,7 +2551,7 @@ ipv6_tcp_md5_novrf()
    # basic use case
    log_start
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: Single address config"
@@ -2559,7 +2559,7 @@ ipv6_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -6 -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: Server no config, client uses password"
@@ -2567,7 +2567,7 @@ ipv6_tcp_md5_novrf()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: Client uses wrong password"
@@ -2575,7 +2575,7 @@ ipv6_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NSB_LO_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: Client address does not match address configured with password"
@@ -2586,7 +2586,7 @@ ipv6_tcp_md5_novrf()
    # client in prefix
    log_start
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: Prefix config"
@@ -2594,7 +2594,7 @@ ipv6_tcp_md5_novrf()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: Prefix config, client uses wrong password"
@@ -2602,7 +2602,7 @@ ipv6_tcp_md5_novrf()
    log_start
    show_hint "Should timeout due to MD5 mismatch"
    run_cmd nettest -6 -s -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -c ${NSB_LO_IP6} -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: Prefix config, client address not in configured prefix"
 }
@@ -2619,7 +2619,7 @@ ipv6_tcp_md5()
    # basic use case
    log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Single address config"
@@ -2627,7 +2627,7 @@ ipv6_tcp_md5()
    log_start
    show_hint "Should timeout since server does not have MD5 auth"
    run_cmd nettest -6 -s -I ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Server no config, client uses password"
@@ -2635,7 +2635,7 @@ ipv6_tcp_md5()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Client uses wrong password"
@@ -2643,7 +2643,7 @@ ipv6_tcp_md5()
    log_start
    show_hint "Should timeout since server config differs from client"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_LO_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Client address does not match address configured with password"
@@ -2654,7 +2654,7 @@ ipv6_tcp_md5()
    # client in prefix
    log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Prefix config"
@@ -2662,7 +2662,7 @@ ipv6_tcp_md5()
    log_start
    show_hint "Should timeout since client uses wrong password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Prefix config, client uses wrong password"
@@ -2670,7 +2670,7 @@ ipv6_tcp_md5()
    log_start
    show_hint "Should timeout since client address is outside of prefix"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -c ${NSB_LO_IP6} -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Prefix config, client address not in configured prefix"
@@ -2681,14 +2681,14 @@ ipv6_tcp_md5()
    log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF"
log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 0 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF"
@@ -2696,7 +2696,7 @@ ipv6_tcp_md5()
    show_hint "Should timeout since client in default VRF uses VRF password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in default VRF with VRF pw"
@@ -2704,21 +2704,21 @@ ipv6_tcp_md5()
    show_hint "Should timeout since client in VRF uses default VRF password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NSB_IP6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NSB_IP6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Single address config in default VRF and VRF, conn in VRF with default VRF pw"
log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF"
log_start
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 0 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF"
@@ -2726,7 +2726,7 @@ ipv6_tcp_md5()
    show_hint "Should timeout since client in default VRF uses VRF password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsc nettest -6 -r ${NSA_IP6} -X ${MD5_PW}
    log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in default VRF with VRF pw"
@@ -2734,7 +2734,7 @@ ipv6_tcp_md5()
    show_hint "Should timeout since client in VRF uses default VRF password"
    run_cmd nettest -6 -s -I ${VRF} -M ${MD5_PW} -m ${NS_NET6} &
    run_cmd nettest -6 -s -M ${MD5_WRONG_PW} -m ${NS_NET6} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${NSA_IP6} -X ${MD5_WRONG_PW}
    log_test $? 2 "MD5: VRF: Prefix config in default VRF and VRF, conn in VRF with default VRF pw"
@@ -2762,7 +2762,7 @@ ipv6_tcp_novrf()
    do
    	log_start
    	run_cmd nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
    done
@@ -2783,7 +2783,7 @@ ipv6_tcp_novrf()
    do
    	log_start
    	run_cmd_nsb nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Client"
    done
@@ -2792,7 +2792,7 @@ ipv6_tcp_novrf()
    do
    	log_start
    	run_cmd_nsb nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 0 "Client, device bind"
    done
@@ -2812,7 +2812,7 @@ ipv6_tcp_novrf()
    do
    	log_start
    	run_cmd nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Global server, local connection"
    done
@@ -2820,7 +2820,7 @@ ipv6_tcp_novrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, unbound client, local connection"
@@ -2829,7 +2829,7 @@ ipv6_tcp_novrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -s -I ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a}
    	log_test_addr ${a} $? 1 "Device server, unbound client, local connection"
    done
@@ -2837,7 +2837,7 @@ ipv6_tcp_novrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a} -d ${NSA_DEV} -0 ${a}
    log_test_addr ${a} $? 0 "Global server, device client, local connection"
@@ -2846,7 +2846,7 @@ ipv6_tcp_novrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 1 "Global server, device client, local connection"
    done
@@ -2855,7 +2855,7 @@ ipv6_tcp_novrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6  -d ${NSA_DEV} -r ${a}
    	log_test_addr ${a} $? 0 "Device server, device client, local conn"
    done
@@ -2888,7 +2888,7 @@ ipv6_tcp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since global server with VRF is disabled"
    	run_cmd nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 1 "Global server"
    done
@@ -2897,7 +2897,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
    done
@@ -2906,7 +2906,7 @@ ipv6_tcp_vrf()
    a=${NSA_LINKIP6}%${NSB_DEV}
    log_start
    run_cmd nettest -6 -s -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${a}
    log_test_addr ${a} $? 0 "VRF server"
@@ -2914,7 +2914,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Device server"
    done
@@ -2933,7 +2933,7 @@ ipv6_tcp_vrf()
    log_start
    show_hint "Should fail 'Connection refused' since global server with VRF is disabled"
    run_cmd nettest -6 -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a} -d ${NSA_DEV}
    log_test_addr ${a} $? 1 "Global server, local connection"
@@ -2954,7 +2954,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
    done
@@ -2963,7 +2963,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
    done
@@ -2972,13 +2972,13 @@ ipv6_tcp_vrf()
    a=${NSA_LINKIP6}%${NSB_DEV}
    log_start
    run_cmd nettest -6 -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${a}
    log_test_addr ${a} $? 0 "Global server"
log_start
    run_cmd nettest -6 -s -I ${VRF} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd_nsb nettest -6 -r ${a}
    log_test_addr ${a} $? 0 "VRF server"
@@ -2986,7 +2986,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 0 "Device server"
    done
@@ -3006,7 +3006,7 @@ ipv6_tcp_vrf()
    	log_start
    	show_hint "Fails 'Connection refused' since client is not in VRF"
    	run_cmd nettest -6 -s -I ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a}
    	log_test_addr ${a} $? 1 "Global server, local connection"
    done
@@ -3019,7 +3019,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd_nsb nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${VRF}
    	log_test_addr ${a} $? 0 "Client, VRF bind"
    done
@@ -3028,7 +3028,7 @@ ipv6_tcp_vrf()
    log_start
    show_hint "Fails since VRF device does not allow linklocal addresses"
    run_cmd_nsb nettest -6 -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 tcp
    run_cmd nettest -6 -r ${a} -d ${VRF}
    log_test_addr ${a} $? 1 "Client, VRF bind"
@@ -3036,7 +3036,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd_nsb nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 0 "Client, device bind"
    done
@@ -3061,7 +3061,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${VRF} -3 ${VRF} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${VRF} -0 ${a}
    	log_test_addr ${a} $? 0 "VRF server, VRF client, local connection"
    done
@@ -3069,7 +3069,7 @@ ipv6_tcp_vrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -s -I ${VRF} -3 ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a} -d ${NSA_DEV} -0 ${a}
    log_test_addr ${a} $? 0 "VRF server, device client, local connection"
@@ -3077,13 +3077,13 @@ ipv6_tcp_vrf()
    log_start
    show_hint "Should fail since unbound client is out of VRF scope"
    run_cmd nettest -6 -s -I ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a}
    log_test_addr ${a} $? 1 "VRF server, unbound client, local connection"
log_start
    run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest -6 -r ${a} -d ${VRF} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, VRF client, local connection"
@@ -3091,7 +3091,7 @@ ipv6_tcp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest -6 -r ${a} -d ${NSA_DEV} -0 ${a}
    	log_test_addr ${a} $? 0 "Device server, device client, local connection"
    done
@@ -3131,13 +3131,13 @@ ipv6_udp_novrf()
    do
    	log_start
    	run_cmd nettest -6 -D -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
log_start
    	run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "Device server"
    done
@@ -3145,7 +3145,7 @@ ipv6_udp_novrf()
    a=${NSA_LO_IP6}
    log_start
    run_cmd nettest -6 -D -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd_nsb nettest -6 -D -r ${a}
    log_test_addr ${a} $? 0 "Global server"
@@ -3155,7 +3155,7 @@ ipv6_udp_novrf()
    #log_start
    #show_hint "Should fail since loopback address is out of scope"
    #run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	#sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    #run_cmd_nsb nettest -6 -D -r ${a}
    #log_test_addr ${a} $? 1 "Device server"
@@ -3175,25 +3175,25 @@ ipv6_udp_novrf()
    do
    	log_start
    	run_cmd_nsb nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -0 ${NSA_IP6}
    	log_test_addr ${a} $? 0 "Client"
log_start
    	run_cmd_nsb nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -0 ${NSA_IP6}
    	log_test_addr ${a} $? 0 "Client, device bind"
log_start
    	run_cmd_nsb nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -C -0 ${NSA_IP6}
    	log_test_addr ${a} $? 0 "Client, device send via cmsg"
log_start
    	run_cmd_nsb nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSB} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -S -0 ${NSA_IP6}
    	log_test_addr ${a} $? 0 "Client, device bind via IPV6_UNICAST_IF"
@@ -3215,7 +3215,7 @@ ipv6_udp_novrf()
    do
    	log_start
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -0 ${a} -1 ${a}
    	log_test_addr ${a} $? 0 "Global server, local connection"
    done
@@ -3223,7 +3223,7 @@ ipv6_udp_novrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -s -D -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -r ${a}
    log_test_addr ${a} $? 0 "Device server, unbound client, local connection"
@@ -3232,7 +3232,7 @@ ipv6_udp_novrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since address is out of device scope"
    	run_cmd nettest -6 -s -D -I ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 1 "Device server, local connection"
    done
@@ -3240,19 +3240,19 @@ ipv6_udp_novrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Global server, device client, local connection"
log_start
    run_cmd nettest -6 -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -C -r ${a}
    log_test_addr ${a} $? 0 "Global server, device send via cmsg, local connection"
log_start
    run_cmd nettest -6 -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -S -r ${a}
    log_test_addr ${a} $? 0 "Global server, device client via IPV6_UNICAST_IF, local connection"
@@ -3261,28 +3261,28 @@ ipv6_udp_novrf()
    	log_start
    	show_hint "Should fail 'No route to host' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV}
    	log_test_addr ${a} $? 1 "Global server, device client, local connection"
log_start
    	show_hint "Should fail 'No route to host' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -C
    	log_test_addr ${a} $? 1 "Global server, device send via cmsg, local connection"
log_start
    	show_hint "Should fail 'No route to host' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -S
    	log_test_addr ${a} $? 1 "Global server, device client via IP_UNICAST_IF, local connection"
log_start
    	show_hint "Should fail 'No route to host' since addresses on loopback are out of device scope"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -r ${a} -d ${NSA_DEV} -S -U
    	log_test_addr ${a} $? 1 "Global server, device client via IP_UNICAST_IF, local connection, with connect()"
    done
@@ -3290,7 +3290,7 @@ ipv6_udp_novrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -D -s -I ${NSA_DEV} -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a} -0 ${a}
    log_test_addr ${a} $? 0 "Device server, device client, local conn"
@@ -3304,7 +3304,7 @@ ipv6_udp_novrf()
    run_cmd_nsb ip -6 ro add ${NSA_IP6}/128 dev ${NSB_DEV}
    log_start
    run_cmd nettest -6 -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd_nsb nettest -6 -D -r ${NSA_IP6}
    log_test $? 0 "UDP in - LLA to GUA"
@@ -3328,7 +3328,7 @@ ipv6_udp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since global server is disabled"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 1 "Global server"
    done
@@ -3337,7 +3337,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -I ${VRF} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
    done
@@ -3346,7 +3346,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "Enslaved device server"
    done
@@ -3368,7 +3368,7 @@ ipv6_udp_vrf()
    	log_start
    	show_hint "Should fail 'Connection refused' since global server is disabled"
    	run_cmd nettest -6 -D -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -d ${VRF} -r ${a}
    	log_test_addr ${a} $? 1 "Global server, VRF client, local conn"
    done
@@ -3377,7 +3377,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -I ${VRF} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd nettest -6 -D -d ${VRF} -r ${a}
    	log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
    done
@@ -3386,25 +3386,25 @@ ipv6_udp_vrf()
    log_start
    show_hint "Should fail 'Connection refused' since global server is disabled"
    run_cmd nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 1 "Global server, device client, local conn"
log_start
    run_cmd nettest -6 -D -I ${VRF} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, device client, local conn"
log_start
    run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, VRF client, local conn"
log_start
    run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Enslaved device server, device client, local conn"
@@ -3419,7 +3419,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "Global server"
    done
@@ -3428,7 +3428,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -I ${VRF} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "VRF server"
    done
@@ -3437,7 +3437,7 @@ ipv6_udp_vrf()
    do
    	log_start
    	run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 udp
    	run_cmd_nsb nettest -6 -D -r ${a}
    	log_test_addr ${a} $? 0 "Enslaved device server"
    done
@@ -3455,7 +3455,7 @@ ipv6_udp_vrf()
    #
    log_start
    run_cmd_nsb nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${NSB_IP6}
    log_test $? 0 "VRF client"
@@ -3466,7 +3466,7 @@ ipv6_udp_vrf()
log_start
    run_cmd_nsb nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${NSB_IP6}
    log_test $? 0 "Enslaved device client"
@@ -3481,13 +3481,13 @@ ipv6_udp_vrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -D -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Global server, VRF client, local conn"
#log_start
    run_cmd nettest -6 -D -I ${VRF} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
@@ -3495,13 +3495,13 @@ ipv6_udp_vrf()
    a=${VRF_IP6}
    log_start
    run_cmd nettest -6 -D -s -3 ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Global server, VRF client, local conn"
log_start
    run_cmd nettest -6 -D -I ${VRF} -s -3 ${VRF} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, VRF client, local conn"
@@ -3517,25 +3517,25 @@ ipv6_udp_vrf()
    a=${NSA_IP6}
    log_start
    run_cmd nettest -6 -D -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Global server, device client, local conn"
log_start
    run_cmd nettest -6 -D -I ${VRF} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "VRF server, device client, local conn"
log_start
    run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${VRF} -r ${a}
    log_test_addr ${a} $? 0 "Device server, VRF client, local conn"
log_start
    run_cmd nettest -6 -D -I ${NSA_DEV} -s -3 ${NSA_DEV} &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${a}
    log_test_addr ${a} $? 0 "Device server, device client, local conn"
@@ -3547,7 +3547,7 @@ ipv6_udp_vrf()
    # link local addresses
    log_start
    run_cmd nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd_nsb nettest -6 -D -d ${NSB_DEV} -r ${NSA_LINKIP6}
    log_test $? 0 "Global server, linklocal IP"
@@ -3558,7 +3558,7 @@ ipv6_udp_vrf()
log_start
    run_cmd_nsb nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${NSB_LINKIP6}
    log_test $? 0 "Enslaved device client, linklocal IP"
@@ -3569,7 +3569,7 @@ ipv6_udp_vrf()
log_start
    run_cmd nettest -6 -D -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd nettest -6 -D -d ${NSA_DEV} -r ${NSA_LINKIP6}
    log_test $? 0 "Enslaved device client, local conn - linklocal IP"
@@ -3582,7 +3582,7 @@ ipv6_udp_vrf()
    run_cmd_nsb ip -6 ro add ${NSA_IP6}/128 dev ${NSB_DEV}
    log_start
    run_cmd nettest -6 -s -D &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 udp
    run_cmd_nsb nettest -6 -D -r ${NSA_IP6}
    log_test $? 0 "UDP in - LLA to GUA"
@@ -3761,7 +3761,7 @@ ipv6_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${varg} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -3775,7 +3775,7 @@ ipv6_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -I ${VRF} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${varg} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -3789,7 +3789,7 @@ ipv6_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -I ${NSA_DEV} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${varg} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -3804,7 +3804,7 @@ ipv6_rt()
    #
    log_start
    run_cmd_nsb nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 tcp
    run_cmd nettest ${varg} -d ${VRF} -r ${NSB_IP6} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -3815,7 +3815,7 @@ ipv6_rt()
log_start
    run_cmd_nsb nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSB} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${NSB_IP6} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -3832,7 +3832,7 @@ ipv6_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest ${varg} -d ${VRF} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -3846,7 +3846,7 @@ ipv6_rt()
    do
    	log_start
    	run_cmd nettest ${varg} -I ${VRF} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd nettest ${varg} -d ${VRF} -r ${a} &
    	sleep 3
    	run_cmd ip link del ${VRF}
@@ -3859,7 +3859,7 @@ ipv6_rt()
    a=${NSA_IP6}
    log_start
    run_cmd nettest ${varg} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -3870,7 +3870,7 @@ ipv6_rt()
log_start
    run_cmd nettest ${varg} -I ${VRF} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -3881,7 +3881,7 @@ ipv6_rt()
log_start
    run_cmd nettest ${varg} -I ${NSA_DEV} -s &
-	sleep 1
+	wait_local_port_listen ${NSA} 12345 tcp
    run_cmd nettest ${varg} -d ${NSA_DEV} -r ${a} &
    sleep 3
    run_cmd ip link del ${VRF}
@@ -3940,7 +3940,7 @@ netfilter_tcp_reset()
    do
    	log_start
    	run_cmd nettest -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -r ${a}
    	log_test_addr ${a} $? 1 "Global server, reject with TCP-reset on Rx"
    done
@@ -3958,7 +3958,7 @@ netfilter_icmp()
    do
    	log_start
    	run_cmd nettest ${arg} -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest ${arg} -r ${a}
    	log_test_addr ${a} $? 1 "Global ${stype} server, Rx reject icmp-port-unreach"
    done
@@ -3997,7 +3997,7 @@ netfilter_tcp6_reset()
    do
    	log_start
    	run_cmd nettest -6 -s &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 -r ${a}
    	log_test_addr ${a} $? 1 "Global server, reject with TCP-reset on Rx"
    done
@@ -4015,7 +4015,7 @@ netfilter_icmp6()
    do
    	log_start
    	run_cmd nettest -6 -s ${arg} &
-		sleep 1
+		wait_local_port_listen ${NSA} 12345 tcp
    	run_cmd_nsb nettest -6 ${arg} -r ${a}
    	log_test_addr ${a} $? 1 "Global ${stype} server, Rx reject icmp-port-unreach"
    done
@@ -4211,12 +4211,12 @@ use_case_snat_on_vrf()
    run_cmd ip6tables -t nat -A POSTROUTING -p tcp -m tcp --dport ${port} -j SNAT --to-source ${NSA_LO_IP6} -o ${VRF}
run_cmd_nsb nettest -s -l ${NSB_IP} -p ${port} &
-	sleep 1
+	wait_local_port_listen ${NSB} ${port} tcp
    run_cmd nettest -d ${VRF} -r ${NSB_IP} -p ${port}
    log_test $? 0 "IPv4 TCP connection over VRF with SNAT"
run_cmd_nsb nettest -6 -s -l ${NSB_IP6} -p ${port} &
-	sleep 1
+	wait_local_port_listen ${NSB} ${port} tcp
    run_cmd nettest -6 -d ${VRF} -r ${NSB_IP6} -p ${port}
    log_test $? 0 "IPv6 TCP connection over VRF with SNAT"
-- 
2.51.0





    

2025

2024

2023

2022

2021

2020

2019

2018

2017

[PATCH 6.6 215/529] selftests: net: replace sleeps in fcnal-test with waits