json.at: Run for Python 2 and 3.

[cascardo/ovs.git] / tests / ovs-macros.at

diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at
index 90fb835..bfd0681 100644 (file)
--- a/tests/ovs-macros.at
+++ b/tests/ovs-macros.at
@@ -38,7 +38,10 @@ ovs_setenv() {
 }
 
 ovs_wait () {
-    # First try a quick sleep, so that the test completes very quickly
+    # First try the condition without waiting.
+    ovs_wait_cond && return 0
+
+    # 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