ctdb-tests: Drop tests that only start and stop daemons
authorMartin Schwenke <martin@meltin.net>
Mon, 8 Oct 2018 02:41:39 +0000 (13:41 +1100)
committerAmitay Isaacs <amitay@samba.org>
Tue, 6 Nov 2018 06:16:16 +0000 (07:16 +0100)
Integration test cases now start and shut down the cluster.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/complex/00_ctdb_init.sh [deleted file]
ctdb/tests/simple/00_ctdb_init.sh [deleted file]
ctdb/tests/simple/99_daemons_shutdown.sh [deleted file]

diff --git a/ctdb/tests/complex/00_ctdb_init.sh b/ctdb/tests/complex/00_ctdb_init.sh
deleted file mode 100755 (executable)
index d45166a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-test_info()
-{
-    cat <<EOF
-Restart the ctdbd daemons of a CTDB cluster.
-
-Ensure that event script reequired for cluster tests are enabled.
-EOF
-}
-
-. "${TEST_SCRIPTS_DIR}/integration.bash"
-
-ctdb_test_init "$@"
-
-set -e
-
-ctdb_test_check_real_cluster
-
-ctdb_stop_all >/dev/null 2>&1 || true
-
-ctdb_init
diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh
deleted file mode 100755 (executable)
index 99eb729..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-test_info()
-{
-    cat <<EOF
-Restart the ctdbd daemons of a CTDB cluster.
-
-No error if ctdbd is not already running on the cluster.
-
-Prerequisites:
-
-* Nodes must be accessible via 'onnode'.
-
-Steps:
-
-1. Restart the ctdb daemons on all nodes using a method according to
-   the test environment and platform.
-
-Expected results:
-
-* The cluster is healthy within a reasonable timeframe.
-EOF
-}
-
-. "${TEST_SCRIPTS_DIR}/integration.bash"
-
-ctdb_test_init "$@"
-
-set -e
-
-ctdb_stop_all >/dev/null 2>&1 || true
-
-setup_ctdb
-
-ctdb_init
diff --git a/ctdb/tests/simple/99_daemons_shutdown.sh b/ctdb/tests/simple/99_daemons_shutdown.sh
deleted file mode 100755 (executable)
index 8d65f61..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-test_info()
-{
-    cat <<EOF
-If we running local daemons then shutdown the daemons.
-
-No error if ctdbd is not already running on the cluster.
-
-Prerequisites:
-
-* Nodes must be accessible via 'onnode'.
-EOF
-}
-
-. "${TEST_SCRIPTS_DIR}/integration.bash"
-
-# Do not call ctdb_test_init() here.  It will setup ctdb_test_exit()
-# to run and that will find the daemons missing and restart them!
-
-if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
-       ctdb_stop_all
-fi