[ovs-dev] [PATCH 2/3] tests: Make OVS_WAIT_WHILE, OVS_WAIT_UNTIL run even faster in some cases.

Ben Pfaff blp at nicira.com
Thu Aug 27 02:48:00 UTC 2015


Sometimes OVS_WAIT_WHILE and OVS_WAIT_UNTIL are used for conditions that
tend to be true immediately but sometimes take a moment or two.  This
change makes such cases 0.1 seconds faster (which could add up over
hundreds of tests).

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 tests/ovs-macros.at | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at
index 3c3d825..73a3724 100644
--- a/tests/ovs-macros.at
+++ b/tests/ovs-macros.at
@@ -7,7 +7,10 @@ m4_include([m4/compat.at])
 m4_divert_push([PREPARE_TESTS])
 [
 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
-- 
2.1.3




More information about the dev mailing list