Test was waiting for SB changes and then verifying that some flows were
properly generated by OVN, but w/o ensuring OVN did run.
Fixes: 1dd27ea7aea4 ("Provide the option to pin ovn-controller and ovn-northd
to a specific version.")
Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn.at | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/ovn.at b/tests/ovn.at
index abd12f0dd..ba947cf08 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -33235,7 +33235,9 @@ wait_row_count Port_Binding 1 logical_port=sw0-p2
'chassis=[[]]'
as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG >
offlows_table0.txt
AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
+
+# Wait for flow - note that we can't use ovn-nbctl sync as northd is stopped.
+OVS_WAIT_FOR_OUTPUT([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
0
])
@@ -33269,7 +33271,7 @@ wait_row_count Port_Binding 1 logical_port=sw0-p2
chassis=$ch
as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG >
offlows_table0.txt
AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl
+OVS_WAIT_FOR_OUTPUT([grep -c "in_port=2" offlows_table0.txt], [0], [dnl
1
])
@@ -33315,7 +33317,7 @@ check ovs-vsctl set open .
external_ids:ovn-remote=$ovn_remote
wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]'
as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG >
offlows_table0.txt
AT_CAPTURE_FILE([offlows_table0.txt])
-AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
+OVS_WAIT_FOR_OUTPUT([grep -c "in_port=2" offlows_table0.txt], [1], [dnl
0
])
--
2.47.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
