Merge commit 'origin/master'

diff --git a/tests/scripts/ctdb_test_functions.bash b/tests/scripts/ctdb_test_functions.bash
index e554680f0a1277120c305607af89a783340a7337..832a42bf16892907a874dc822a581aa304857579 100644 (file)
--- a/tests/scripts/ctdb_test_functions.bash
+++ b/tests/scripts/ctdb_test_functions.bash
@@ -297,8 +297,8 @@ wait_until ()
     echo -n "<${timeout}|"
     local t=$timeout
     while [ $t -gt 0 ] ; do
-       ("$@")
-       local rc=$?
+       local rc=0
+       "$@" || rc=$?
        if { ! $negate && [ $rc -eq 0 ] ; } || \
            { $negate && [ $rc -ne 0 ] ; } ; then
            echo "|$(($timeout - $t))|"