ctdb-tests: Rename ctdb_start_all() -> ctdb_init()

There are too many functions to start/stop daemons.  Simplify this.

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

diff --git a/ctdb/tests/complex/00_ctdb_init.sh b/ctdb/tests/complex/00_ctdb_init.sh
index f4905e81a58d9fb159fa8b8e3bd694396444127f..41eeac05b68b212dce572e1ef156f7d147b978b1 100755 (executable)
--- a/ctdb/tests/complex/00_ctdb_init.sh
+++ b/ctdb/tests/complex/00_ctdb_init.sh
@@ -21,4 +21,4 @@ ctdb_stop_all >/dev/null 2>&1 || true
 
 ctdb_enable_cluster_test_event_scripts
 
-ctdb_start_all
+ctdb_init

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 3750c442eba2da186eb1826372edfb62f179c188..6134792f2de929004c6da1a853ed234d79220f6b 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -48,11 +48,11 @@ ctdb_test_exit ()
        echo "Reconfiguring cluster..."
        setup_ctdb
 
-       ctdb_start_all
+       ctdb_init
     else
        # This could be made unconditional but then we might get
-       # duplication from the recovery in ctdb_start_all().  We want to
-       # leave the recovery in ctdb_start_all() so that future tests that
+       # duplication from the recovery in ctdb_init().  We want to
+       # leave the recovery in ctdb_init() so that future tests that
        # might do a manual restart mid-test will benefit.
        echo "Forcing a recovery..."
        onnode 0 $CTDB recover
@@ -524,7 +524,7 @@ restart_ctdb_1 ()
     onnode "$1" $CTDB_TEST_WRAPPER _service_ctdb restart
 }
 
-ctdb_start_all ()
+ctdb_init ()
 {
     local i
     for i in $(seq 1 5) ; do

diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh
index 26b2615a0bfcb1bc4af57ce3db2689b3fc9dd632..9c3d374a0f246c007ac39813472ca7c7f1cf35bf 100755 (executable)
--- a/ctdb/tests/simple/00_ctdb_init.sh
+++ b/ctdb/tests/simple/00_ctdb_init.sh
@@ -36,4 +36,4 @@ fi
 
 setup_ctdb
 
-ctdb_start_all
+ctdb_init