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 <[email protected]> Acked-by: Ben Pfaff <[email protected]>
vefimova · Jan 30, 2015 · 9530457 · 9530457
1 parent 5989a51
commit 9530457
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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