Test suite: Fix the timeouts on the skip share check tests.

[vlendec/samba-autobuild/.git] / ctdb / tests / simple / 04_ctdb_setvar.sh

diff --git a/ctdb/tests/simple/04_ctdb_setvar.sh b/ctdb/tests/simple/04_ctdb_setvar.sh
index 9348308f2d4f341c798184ce029e5042fdca0efb..e8eda3abc4364c465c6f9842044d9d981f87e014 100755 (executable)
--- a/ctdb/tests/simple/04_ctdb_setvar.sh
+++ b/ctdb/tests/simple/04_ctdb_setvar.sh
@@ -36,7 +36,10 @@ ctdb_test_init "$@"
 
 set -e
 
-onnode 0 $CTDB_TEST_WRAPPER cluster_is_healthy
+cluster_is_healthy
+
+# Reset configuration
+ctdb_restart_when_done
 
 var="RecoverTimeout"
 
@@ -67,15 +70,10 @@ try_command_on_node -v 0 "$CTDB listvars | grep '^$var'"
 check="${out#*= }"
 
 if [ "$incr" != "$check" ] ; then
-    echo "Nope, that didn't work.  Restarting ctdb to get back into known state..."
-    restart_ctdb
+    echo "Nope, that didn't work..."
     exit 1
 fi
 
 echo "Look's good!  Putting the old value back..."
 cmd="$CTDB setvar $var $val"
 try_command_on_node 0 $cmd
-
-echo "All done..."
-
-ctdb_test_exit