summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2016-12-23 13:33:50 -0800
committerBen Pfaff <blp@ovn.org>2016-12-23 16:07:24 -0800
commit8cdc43128054604567682cf019d8b8ed31b223fe (patch)
tree89ed1a48618a4ed25d5b1d4db3c5073413967c6a /tests
parenta203ce69c96e8a38c71113973caf64a22003616f (diff)
downloadopenvswitch-8cdc43128054604567682cf019d8b8ed31b223fe.tar.gz
tests: Fix race in "ovn -- vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS".
The 1-second sleep to wait for the bind to occur is not long enough on slow mips machines. This fixes the problem. Reported-at: https://buildd.debian.org/status/fetch.php?pkg=openvswitch&arch=mipsel&ver=2.6.2%7Epre%2Bgit20161223-1&stamp=1482523419&file=log Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/ovn.at4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/ovn.at b/tests/ovn.at
index 557b2ca26..b7cb4cbef 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -1773,9 +1773,7 @@ vtep-ctl add-ls lsw0
start_daemon ovs-vtep br-vtep
start_daemon ovn-controller-vtep --vtep-db=unix:"$ovs_base"/vtep/db.sock --ovnsb-db=unix:"$ovs_base"/ovn-sb/ovn-sb.sock
-sleep 1
-
-vtep-ctl bind-ls br-vtep br-vtep_n2 0 lsw0
+OVS_WAIT_UNTIL([vtep-ctl bind-ls br-vtep br-vtep_n2 0 lsw0])
OVS_WAIT_UNTIL([test -n "`as vtep vtep-ctl get-replication-mode lsw0 |
grep -- source`"])