From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Wed, 14 Oct 2015 18:41:41 +0000 (+0000)
Subject: ofproto.at: Workaround a race
X-Git-Tag: v2.5.0~256
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=a6d1a2997db48320d8bd0710f6c3adc83166ca01;p=cascardo%2Fovs.git

ofproto.at: Workaround a race

While a barrier serializes requests from the same connection,
it doesn't wait for requests from other connections to the switch.
Replace the barrier with infamous "sleep 1" to workaround the problem.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
Acked-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/tests/ofproto.at b/tests/ofproto.at
index aef7f0ce1..0a3629009 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -2438,8 +2438,7 @@ udp,vlan_tci=0x0000,dl_src=00:26:b9:8c:b0:f9,dl_dst=00:25:83:df:b4:00,nw_src=172
     fi
     AT_FAIL_IF([test X"$1" != X])
 
-    ovs-appctl -t ovs-ofctl ofctl/barrier
-    echo >>expout "OFPT_BARRIER_REPLY (OF1.2):"
+    sleep 1
 
     AT_CHECK(
       [[sed '