tests: Address netcat 7.94 changes.

Fedora received an update of netcat to version 7.94, this version brings ability for UDP to accept multiple connections without closing (-k/--keep-open) [0]. That had negative impact on the tests as the UDP netcat server was closing sooner that expected. Make sure that the server is alive when we expect it to and avoid checking kill of server that might be already finished. [0] nmap/nmap#1223 Signed-off-by: Ales Musil <[email protected]> Signed-off-by: Dumitru Ceara <[email protected]>
hzhou8 · Mar 19, 2024 · 0a35824 · 0a35824
1 parent e8ac181
commit 0a35824
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tests/system-ovn-kmod.at b/tests/system-ovn-kmod.at
@@ -684,7 +684,7 @@ test_fragmented_traffic() {
     NS_CHECK_EXEC([client], [$PYTHON3 ./client.py])
     OVS_WAIT_UNTIL([test "$(cat tcpdump-server.tcpdump | wc -l)" = "4"])
 
-    check kill $(cat tcpdump-client.pid) $(cat tcpdump-server.pid) $(cat server.pid)
+    kill $(cat tcpdump-client.pid) $(cat tcpdump-server.pid) $(cat server.pid)
 }
 
 AS_BOX([LB on router without port and protocol])
@@ -821,8 +821,7 @@ wait_for_ports_up
 check ovn-nbctl --wait=hv sync
 
 # Create service that listens for TCP and UDP
-NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc0.pid])
-NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc1.pid])
+NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc0.pid])
 
 test_icmp() {
     # Make sure that a ping works as expected
@@ -846,7 +845,9 @@ icmp,orig=(src=173.0.1.2,dst=172.16.0.102,id=<cleared>,type=8,code=0),reply=(src
 }
 
 test_udp() {
+    NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc1.pid])
     NS_CHECK_EXEC([vm1], [nc -u 30.0.0.1 1234 -p 1222 -z])
+    kill $(cat nc1.pid)
 
     AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \
     sed -e 's/zone=[[0-9]]*/zone=<cleared>/'], [0], [dnl