ctdb-tests: Drop functions daemons_start(), daemons_stop()

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

Inline the functionality into ctdb_start_all() and ctdb_stop_all().

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

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index ac4e61e681a62036d622f5c57a1f9c66414317ce..58b1c823a369a60dee6c79fcdfb140fdac8818b9 100644 (file)
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -170,7 +170,7 @@ start_ctdb_1 ()
             onnode "$pnn" ctdbd_wrapper start
 }
 
-daemons_start ()
+ctdb_start_all ()
 {
     echo "Starting $TEST_LOCAL_DAEMONS ctdb daemons..."
 
@@ -187,7 +187,7 @@ stop_ctdb_1 ()
        onnode "$pnn" ctdbd_wrapper stop
 }
 
-daemons_stop ()
+ctdb_stop_all ()
 {
     echo "Stopping $TEST_LOCAL_DAEMONS ctdb daemons..."
 
@@ -207,17 +207,7 @@ restart_ctdb_1 ()
 
 maybe_stop_ctdb ()
 {
-    daemons_stop
-}
-
-ctdb_stop_all ()
-{
-       daemons_stop
-}
-
-ctdb_start_all ()
-{
-       daemons_start
+       ctdb_stop_all
 }
 
 # onnode will use CTDB_BASES to help the ctdb tool connection to each