[ovs-dev] [PATCH] tests: Fix race in "ovn -- vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS".

Ben Pfaff blp at ovn.org
Fri Dec 23 21:34:14 UTC 2016


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 at ovn.org>
---
 tests/ovn.at | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 557b2ca..b7cb4cb 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`"])
-- 
2.10.2



More information about the dev mailing list