[ovs-dev] [PATCH 2/5] ofproto: Fix a race in pause and resume test

YAMAMOTO Takashi yamamoto at valinux.co.jp
Mon Mar 31 06:24:28 UTC 2014


Signed-off-by: YAMAMOTO Takashi <yamamoto at valinux.co.jp>
---
 tests/ofproto.at | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/ofproto.at b/tests/ofproto.at
index 8656d98..e98b526 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
 
-- 
1.8.3.1




More information about the dev mailing list