ctdb-tests: Flag setup, startup, shutdown failures as test errors

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index adf8d0363cf4edd17f7c8fa511e5d7fefc6c387b..31f4387a404bdbb52f0edcceb8a53222f51f854a 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -50,7 +50,7 @@ ctdb_test_exit ()
     unset ctdb_test_exit_hook
 
     echo "Stopping cluster..."
-    ctdb_nodes_stop
+    ctdb_nodes_stop || ctdb_test_error "Cluster shutdown failed"
 
     exit $status
 }
@@ -95,10 +95,10 @@ ctdb_test_init ()
        ctdb_nodes_stop >/dev/null 2>&1 || true
 
        echo "Configuring cluster..."
-       setup_ctdb "$@" || exit 1
+       setup_ctdb "$@" || ctdb_test_error "Cluster configuration failed"
 
        echo "Starting cluster..."
-       ctdb_init || exit 1
+       ctdb_init || ctdb_test_error "Cluster startup failed"
 
        echo  "*** SETUP COMPLETE AT $(date '+%F %T'), RUNNING TEST..."
 }