ctdb/tests/integration: Update daemons shutdown pseudo-test

Don't scatter the TEST_LOCAL_DAEMONS logic around the code.  Limit it
to the local daemons file.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

ctdb/tests/scripts/integration.bash

@@ -518,6 +518,12 @@ restart_ctdb ()
     return 1
 }
 
+# Does nothing on cluster and should be overridden for local daemons
+maybe_stop_ctdb ()
+{
+    :
+}
+
 ctdb_restart_when_done ()
 {
     ctdb_test_restart_scheduled=true

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!
 
-if [ -n "$TEST_LOCAL_DAEMONS" ] && $TEST_CLEANUP ; then
-    daemons_stop
-fi
+# We only want to consider stopping CTDB if we're running local
+# daemons.  This function will do the right thing.
+maybe_stop_ctdb

ctdb/tests/simple/scripts/local_daemons.bash

@@ -120,3 +120,10 @@ daemons_start ()
 	daemons_start_1 $i "$@"
     done
 }
+
+maybe_stop_ctdb ()
+{
+    if $TEST_CLEANUP ; then
+	daemons_stop
+    fi
+}