diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-01-15 12:12:51 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-01-15 15:28:16 -0800 |
| commit | f59613353be350c697f76af2bba1205f7a7ad279 (patch) | |
| tree | b1edc00c3f65a5a8f410788d50599eb037cb9d10 | |
| parent | 24c8ae53303ff25d118bb96d237da21a32085160 (diff) | |
tests: New macro OVS_WAIT_WHILE.
For use by upcoming tests.
| -rw-r--r-- | tests/ovsdb-monitor.at | 2 | ||||
| -rw-r--r-- | tests/testsuite.at | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index 47300ea3..31927671 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -32,7 +32,7 @@ m4_define([OVSDB_CHECK_MONITOR], OVS_CHECK_LCOV([ovsdb-client transact unix:socket '[[]]'], [0], [ignore], [ignore], [kill `cat server-pid client-pid`]) AT_CHECK([ovs-appctl -t $PWD/unixctl -e exit], [0], [ignore], [ignore]) - OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid && exit 0]) + OVS_WAIT_UNTIL([test ! -e server-pid && test ! -e client-pid]) AT_CHECK([perl $srcdir/uuidfilt.pl output], [0], [$6], [ignore]) AT_CLEANUP]) diff --git a/tests/testsuite.at b/tests/testsuite.at index 4117f201..6ec1a809 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -18,7 +18,7 @@ AT_TESTED([ovs-vswitchd]) AT_TESTED([ovs-vsctl]) AT_TESTED([perl]) -m4_define([OVS_WAIT_UNTIL], +m4_define([OVS_WAIT], [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 @@ -30,7 +30,10 @@ m4_define([OVS_WAIT_UNTIL], sleep 1 $1 done - exit 1], [0], [ignore], [ignore])]) + exit 1], [0], [ignore], [ignore], [$2])]) + +m4_define([OVS_WAIT_UNTIL], [OVS_WAIT([if $1; then exit 0; fi], [$2])]) +m4_define([OVS_WAIT_WHILE], [OVS_WAIT([if $1; then :; else exit 0; fi], [$2])]) m4_include([tests/ovsdb-macros.at]) m4_include([tests/lcov-pre.at]) |