From: Martin Schwenke <martin@meltin.net>
Date: Thu, 27 Sep 2018 06:02:54 +0000 (+1000)
Subject: ctdb-tests: Don't used daemons_start()/daemons_stop() directly in tests
X-Git-Tag: tdb-1.3.17~1437
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ede41adff57624120f8f8a09358bd516bcebea;p=thirdparty%2Fsamba.git

ctdb-tests: Don't used daemons_start()/daemons_stop() directly in tests

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/19_ip_takeover_noop.sh b/ctdb/tests/simple/19_ip_takeover_noop.sh
index f369988274e..670e33e3408 100755
--- a/ctdb/tests/simple/19_ip_takeover_noop.sh
+++ b/ctdb/tests/simple/19_ip_takeover_noop.sh
@@ -31,11 +31,11 @@ ctdb_restart_when_done
 
 select_test_node_and_ips
 
-daemons_stop
+ctdb_stop_all
 
 echo "Starting CTDB with failover disabled..."
 setup_ctdb --disable-failover
-daemons_start
+ctdb_start_all
 
 wait_until_ready
 
@@ -53,11 +53,11 @@ EOF
 echo "GOOD: All IP addresses are unassigned"
 
 echo "----------------------------------------"
-daemons_stop
+ctdb_stop_all
 
 echo "Starting CTDB with an empty public addresses configuration..."
 setup_ctdb --no-public-addresses
-daemons_start
+ctdb_start_all
 
 wait_until_ready
 
diff --git a/ctdb/tests/simple/28_zero_eventscripts.sh b/ctdb/tests/simple/28_zero_eventscripts.sh
index b360ab87689..ee976cba107 100755
--- a/ctdb/tests/simple/28_zero_eventscripts.sh
+++ b/ctdb/tests/simple/28_zero_eventscripts.sh
@@ -26,14 +26,14 @@ fi
 # Reset configuration
 ctdb_restart_when_done
 
-daemons_stop
+ctdb_stop_all
 
 echo "Starting CTDB with an empty eventscript directory..."
 setup_ctdb --no-event-scripts
-daemons_start
+ctdb_start_all
 
 wait_until_ready
 
 echo "Good, that seems to work!"
 
-daemons_stop
+ctdb_stop_all