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

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/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 6134792f2de929004c6da1a853ed234d79220f6b..5f31ae9a7146ceabfed86d0e14cd39c3f399dfd8 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -498,7 +498,7 @@ ctdb_stop_all ()
 {
        onnode -p all $CTDB_TEST_WRAPPER _service_ctdb stop
 }
-_ctdb_start_all ()
+ctdb_start_all ()
 {
        onnode -p all $CTDB_TEST_WRAPPER _service_ctdb start
 }
@@ -528,7 +528,7 @@ ctdb_init ()
 {
     local i
     for i in $(seq 1 5) ; do
-       _ctdb_start_all || {
+       ctdb_start_all || {
            echo "Start failed.  Trying again in a few seconds..."
            sleep_for 5
            continue

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 572b87be64b699e358558a2b9298ab76b75861df..ac4e61e681a62036d622f5c57a1f9c66414317ce 100644 (file)
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -215,7 +215,7 @@ ctdb_stop_all ()
        daemons_stop
 }
 
-_ctdb_start_all ()
+ctdb_start_all ()
 {
        daemons_start
 }