diff mbox series

[ovs-dev,06/10] tests: Fix "ovn-controller - Chassis other_config".

Message ID 20240212175537.1356073-7-xsimonar@redhat.com
State Accepted
Headers show
Series Fixes to 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 Feb. 12, 2024, 5:55 p.m. UTC 
Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/ovn-controller.at | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index 8dda85f53..3089aea9d 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -213,6 +213,13 @@  if test X$HAVE_OPENSSL = Xyes; then
     # TODO implement check for change of certificates in ovn-controller
     # and remove this workaround.
     ovs-vsctl set Open_vSwitch . external-ids:ovn-remote=unix:/dev/null
+    # Make sure that the ovn-remote change is handled by ovn-controller.
+    # Without this, ovn-controller could handle both this change and next ovn-remote change within the same loop,
+    # resulting in no change.
+    # Use 2 ovn-appctl to guarentee that ovn-controller run the full loop, and not just the unixctl handling
+    OVS_WAIT_UNTIL([test x$(ovn-appctl -t ovn-controller debug/status) = "xrunning"])
+    OVS_WAIT_UNTIL([test x$(ovn-appctl -t ovn-controller debug/status) = "xrunning"])
+
 fi
 ovs-vsctl -- set Open_vSwitch . external-ids:hostname="${sysid}" \
           -- set Open_vSwitch . external-ids:system-id="${sysid}" \