diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-08-18 21:33:33 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-09-01 00:13:06 +0200 |
| commit | fc493780cf1ccd8b164cd3606a8c64715d33cf2f (patch) | |
| tree | 89fe170a6b0f5326b3d6c68748f8f598d7a4eb05 /ctdb | |
| parent | 981e674a7472017274c9b169c776d5c5e8bd1469 (diff) | |
| download | samba-fc493780cf1ccd8b164cd3606a8c64715d33cf2f.tar.gz | |
ctdb-tests: Shutdown local daemons unconditionally
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/tests/simple/99_daemons_shutdown.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/simple/scripts/local_daemons.bash | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/tests/simple/99_daemons_shutdown.sh b/ctdb/tests/simple/99_daemons_shutdown.sh index 42ea1f4031c..d20ca5ba693 100755 --- a/ctdb/tests/simple/99_daemons_shutdown.sh +++ b/ctdb/tests/simple/99_daemons_shutdown.sh @@ -3,7 +3,7 @@ test_info() { cat <<EOF -If we running local daemons and TEST_CLEANUP is true then shutdown the daemons. +If we running local daemons then shutdown the daemons. No error if ctdbd is not already running on the cluster. diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash index b702a3e659f..a0c807725df 100644 --- a/ctdb/tests/simple/scripts/local_daemons.bash +++ b/ctdb/tests/simple/scripts/local_daemons.bash @@ -240,9 +240,7 @@ restart_ctdb_1 () maybe_stop_ctdb () { - if $TEST_CLEANUP ; then - daemons_stop - fi + daemons_stop } _restart_ctdb_all () |