ctdb-tests: Explicitly check for local daemons when shutting down

This is clearer if the logic is explicit...  and...

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/simple/99_daemons_shutdown.sh b/ctdb/tests/simple/99_daemons_shutdown.sh
index d20ca5ba693b5f6417c8ac43744fc517f11a3ee3..8d65f613976455195fdfff812d49faa7fb5a5786 100755 (executable)
--- a/ctdb/tests/simple/99_daemons_shutdown.sh
+++ b/ctdb/tests/simple/99_daemons_shutdown.sh
@@ -18,6 +18,6 @@ EOF
 # 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!
 
-# We only want to consider stopping CTDB if we're running local
-# daemons.  This function will do the right thing.
-maybe_stop_ctdb
+if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
+       ctdb_stop_all
+fi