diff mbox

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

Message ID 20161223213414.4426-1-blp@ovn.org
State Accepted
Headers show

Commit Message

Ben Pfaff Dec. 23, 2016, 9:34 p.m. UTC
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>
---
 tests/ovn.at | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Justin Pettit Dec. 23, 2016, 10:18 p.m. UTC | #1
> On Dec 23, 2016, at 1:34 PM, Ben Pfaff <blp@ovn.org> wrote:
> 
> 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>

--Justin
Ben Pfaff Dec. 24, 2016, 12:08 a.m. UTC | #2
On Fri, Dec 23, 2016 at 02:18:00PM -0800, Justin Pettit wrote:
> 
> > On Dec 23, 2016, at 1:34 PM, Ben Pfaff <blp@ovn.org> wrote:
> > 
> > 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>

Thank you.  I applied this to master and branch-2.6.
diff mbox

Patch

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`"])