From a3082026a133b8d013c7f10bd41429606562716d Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Fri, 30 Jan 2015 10:41:18 -0800 Subject: [PATCH] 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 Acked-by: Ben Pfaff --- tests/ovs-vsctl.at | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 95f60964b..576d33955 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -1215,6 +1215,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 @@ -1250,6 +1252,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 -- 2.20.1