diff options
| author | Alex Wang <alexw@nicira.com> | 2015-01-30 10:41:18 -0800 |
|---|---|---|
| committer | Alex Wang <alexw@nicira.com> | 2015-01-30 14:59:27 -0800 |
| commit | 9530457f245a886c6594409ad378f827bbf69728 (patch) | |
| tree | d882ccee5cbe320f5ae9be3367831463ab1777d9 /tests/ovs-vsctl.at | |
| parent | 5989a51c8815d2ca5c803ed6bbed2760946440ea (diff) | |
| download | openvswitch-9530457f245a886c6594409ad378f827bbf69728.tar.gz | |
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>
Diffstat (limited to 'tests/ovs-vsctl.at')
| -rw-r--r-- | tests/ovs-vsctl.at | 4 |
1 files changed, 4 insertions, 0 deletions
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 |