From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Mon, 31 Mar 2014 03:22:20 +0000 (+0900)
Subject: ofproto: Fix a race in pause and resume test
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c48216295643f96ee734f812d810ede35d613635;p=sliver-openvswitch.git

ofproto: Fix a race in pause and resume test

Acked-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
---

diff --git a/tests/ofproto.at b/tests/ofproto.at
index 8656d982e..e98b52663 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -2168,7 +2168,12 @@ AT_CHECK([ovs-ofctl mod-flows br0 in_port=2,cookie=2,actions=output:2])
 AT_CHECK([ovs-ofctl del-flows br0 cookie=1/-1])
 
 ovs-appctl -t ovs-ofctl ofctl/unblock
-ovs-appctl -t ovs-ofctl ofctl/barrier
+
+# Wait for the connection resumed.
+# A barrier doesn't work for this purpose.
+#    https://www.mail-archive.com/dev@openvswitch.org/msg27013.html
+#    https://www.mail-archive.com/dev@openvswitch.org/msg27675.html
+OVS_WAIT_UNTIL([grep NXT_FLOW_MONITOR_RESUMED monitor.log])
 
 ovs-appctl -t ovs-ofctl exit