From: Martin Schwenke <martin@meltin.net>
Date: Fri, 6 Dec 2019 05:12:08 +0000 (+1100)
Subject: ctdb-tests: Flag setup, startup, shutdown failures as test errors
X-Git-Tag: ldb-2.1.1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5de9b26d4019e25d644c6e28e5f3a58f3f8730;p=thirdparty%2Fsamba.git

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 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..."
 }