ovn-controller.at: fix occasional ovn-bridge-mappings test failure

This patch fixes the time issue in the test case so that when external-ids is updated in Open_vSwitch OVSDB, give some time for SB OVSDB to get updated by ovn-controller. Signed-off-by: Han Zhou <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
blp · May 8, 2018 · 62c2b05 · 62c2b05
1 parent ef67948
commit 62c2b05
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
@@ -51,10 +51,7 @@ patch
 check_bridge_mappings () {
     local_mappings=$1
     sysid=$(ovs-vsctl get Open_vSwitch . external_ids:system-id)
-    chassis_mappings=$(ovn-sbctl get Chassis ${sysid} external_ids:ovn-bridge-mappings | sed -e 's/\"//g')
-    echo $local_mappings
-    echo $chassis_mappings
-    AT_CHECK([test "${local_mappings}" = "${chassis_mappings}"])
+    OVS_WAIT_UNTIL([test x"${local_mappings}" = x$(ovn-sbctl get Chassis ${sysid} external_ids:ovn-bridge-mappings | sed -e 's/\"//g')])
 }
 
 # Initially there should be no patch ports.