diff mbox series

[ovs-dev,04/13] tests: fixed "Load balancer health checks - IPv4 and IPv6"

Message ID 20230627093043.1465206-5-xsimonar@redhat.com
State Accepted
Headers show
Series Fixes Multiple Unit Tests | expand

Checks

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

Commit Message

Xavier Simonart June 27, 2023, 9:30 a.m. UTC 
Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/ovn.at | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index ca0069132..1dc09a168 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -25065,13 +25065,14 @@  OVS_WAIT_FOR_OUTPUT(
 svc_mon_src_mac=`ovn-nbctl get NB_Global . options:svc_monitor_mac | \
 sed s/":"//g | sed s/\"//g`
 
+# If the system is overloaded and the test runs slowly, we might get multiple similar packets (just varying by src port)
 OVS_WAIT_UNTIL(
-    [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
+    [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
 grep "505400000003${svc_mon_src_mac}" | wc -l`]
 )
 
 OVS_WAIT_UNTIL(
-    [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
+    [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
 grep "405400000003${svc_mon_src_mac}" | wc -l`]
 )
 
@@ -25079,12 +25080,12 @@  check ovn-nbctl set load_balancer_health_check 10.0.0.10:80 options:failure_coun
 wait_row_count Service_Monitor 2 status=offline
 
 OVS_WAIT_UNTIL(
-    [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
+    [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
 grep "505400000003${svc_mon_src_mac}" | wc -l`]
 )
 
 OVS_WAIT_UNTIL(
-    [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
+    [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
 grep "405400000003${svc_mon_src_mac}" | wc -l`]
 )
 
@@ -25264,12 +25265,12 @@  svc_mon_src_mac=`ovn-nbctl get NB_Global . options:svc_monitor_mac | \
 sed s/":"//g | sed s/\"//g`
 
 OVS_WAIT_UNTIL(
-    [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
+    [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
 grep "505400000003${svc_mon_src_mac}" | wc -l`]
 )
 
 OVS_WAIT_UNTIL(
-    [test 1 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
+    [test 1 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
 grep "405400000003${svc_mon_src_mac}" | wc -l`]
 )
 
@@ -25277,12 +25278,12 @@  check ovn-nbctl set load_balancer_health_check [[2001::a]]:80 options:failure_co
 wait_row_count Service_Monitor 2 status=offline
 
 OVS_WAIT_UNTIL(
-    [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
+    [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv1/vif1-tx.pcap | \
 grep "505400000003${svc_mon_src_mac}" | wc -l`]
 )
 
 OVS_WAIT_UNTIL(
-    [test 2 = `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
+    [test 2 -le `$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" hv2/vif1-tx.pcap | \
 grep "405400000003${svc_mon_src_mac}" | wc -l`]
 )