From: Martin Schwenke <martin@meltin.net>
Date: Fri, 28 Sep 2018 10:39:18 +0000 (+1000)
Subject: ctdb-tests: Explicitly check for local daemons when shutting down
X-Git-Tag: tdb-1.3.17~1435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cd6a00399d4303f19aa2eafe8560185a4248b35;p=thirdparty%2Fsamba.git

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 d20ca5ba693..8d65f613976 100755
--- 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