summaryrefslogtreecommitdiff
path: root/ctdb/tests/scripts/integration.bash
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2019-12-06 16:12:08 +1100
committerAmitay Isaacs <amitay@samba.org>2020-02-18 02:56:38 +0000
commit3d5de9b26d4019e25d644c6e28e5f3a58f3f8730 (patch)
tree94e2051342c39c612cf74e133f6b11acc4faa295 /ctdb/tests/scripts/integration.bash
parent455d931a16815f3b8ee47e2b1d5aeb13e76568b2 (diff)
downloadsamba-3d5de9b26d4019e25d644c6e28e5f3a58f3f8730.tar.gz
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>
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
-rw-r--r--ctdb/tests/scripts/integration.bash6
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index adf8d0363cf..31f4387a404 100644
--- 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..."
}