| Message ID | 20240319065032.274398-2-amusil@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v4,1/2] tests: Add helper for tcpdump. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
On 3/19/24 07:50, Ales Musil wrote: > 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] https://github.com/nmap/nmap/issues/1223 > Signed-off-by: Ales Musil <amusil@redhat.com> > --- > v4: Rebase on top of current main. > --- Thanks for fixing the CI, Ales! Applied to main and 24.03. I tried to backport it further but it didn't apply cleanly and I stopped after a failed attempt to manually fix conflicts. Could you please send a backport patch for the rest of the supported branches? Thanks, Dumitru
diff --git a/tests/system-ovn-kmod.at b/tests/system-ovn-kmod.at index fed31114c..63ecc7ff4 100644 --- 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
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] https://github.com/nmap/nmap/issues/1223 Signed-off-by: Ales Musil <amusil@redhat.com> --- v4: Rebase on top of current main. --- tests/system-ovn-kmod.at | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)