summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorHan Zhou <zhouhan@gmail.com>2018-05-08 10:29:40 -0700
committerBen Pfaff <blp@ovn.org>2018-05-08 12:59:00 -0700
commit62c2b0554ed40b0e18c63cf603934fc04e1a4f75 (patch)
treed14bd87440057d2993a1225b0b8054f7548f2718 /tests
parentef679483a4e8d93eebc20d0627a9937e66bb6fda (diff)
downloadopenvswitch-62c2b0554ed40b0e18c63cf603934fc04e1a4f75.tar.gz
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 <hzhou8@ebay.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/ovn-controller.at5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index 3244707f6..00900d43d 100644
--- 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.