From: Alex Wang <alexw@nicira.com>
Date: Fri, 30 Jan 2015 18:41:18 +0000 (-0800)
Subject: ovs-vsctl.at: Fix intermittent failure.
X-Git-Tag: v2.4.0~662
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=9530457f245a886c6594409ad378f827bbf69728;p=cascardo%2Fovs.git

ovs-vsctl.at: Fix intermittent failure.

This commit fixes the intermittent test failure caused by the
race between the test thread and logging thread.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index f6e69946a..5007c5bad 100644
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -1242,6 +1242,8 @@ m4_foreach(
 AT_CHECK([ovs-vsctl add-port br0 reserved_name], [0], [], [dnl
 ovs-vsctl: Error detected while setting up 'reserved_name'.  See ovs-vswitchd log for details.
 ])
+# Prevent race.
+OVS_WAIT_UNTIL([test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1])
 # Detect the warning log message
 AT_CHECK([sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log], [0], [dnl
 |bridge|WARN|could not create interface reserved_name, name is reserved
@@ -1280,6 +1282,8 @@ m4_foreach(
 AT_CHECK([ovs-vsctl add-port br0 reserved_name], [0], [], [dnl
 ovs-vsctl: Error detected while setting up 'reserved_name'.  See ovs-vswitchd log for details.
 ])
+# Prevent race.
+OVS_WAIT_UNTIL([test `grep -- "|WARN|" ovs-vswitchd.log | wc -l` -ge 1])
 # Detect the warning log message
 AT_CHECK([sed -n "s/^.*\(|bridge|WARN|.*\)$/\1/p" ovs-vswitchd.log], [0], [dnl
 |bridge|WARN|could not create interface reserved_name, name is reserved