summaryrefslogtreecommitdiff
path: root/tests/testsuite.at
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2009-12-03 14:45:16 -0800
committerBen Pfaff <blp@nicira.com>2009-12-03 14:47:00 -0800
commitb12e3c41afaeb9faed1e3562954ec78fd595677d (patch)
treec238bd7154376c5f7f8457c610eec4bd4aa849e8 /tests/testsuite.at
parent3f262d7de1dea6b4f70db1c4ff2e79de89c74b0d (diff)
downloadopenvswitch-b12e3c41afaeb9faed1e3562954ec78fd595677d.tar.gz
ovsdb: Fix race conditions in test suite.
Diffstat (limited to 'tests/testsuite.at')
-rw-r--r--tests/testsuite.at14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/testsuite.at b/tests/testsuite.at
index d5eadc214..ceded7e16 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -18,6 +18,20 @@ AT_TESTED([ovs-vswitchd])
AT_TESTED([ovs-vsctl])
AT_TESTED([perl])
+m4_define([OVS_WAIT_UNTIL],
+ [AT_CHECK(
+ [# First try a quick sleep, so that the test completes very quickly
+ # in the normal case. POSIX doesn't require fractional times to
+ # work, so this might not work.
+ sleep 0.1
+ $1
+ # Then wait up to 10 seconds.
+ for d in 0 1 2 3 4 5 6 7 8 9; do
+ sleep 1
+ $1
+ done
+ exit 1], [0], [ignore], [ignore])])
+
m4_include([tests/lcov-pre.at])
m4_include([tests/library.at])
m4_include([tests/dir_name.at])