diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-11-28 17:27:06 +1100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-12-05 00:41:50 +0100 |
| commit | 6b15fe247c4c026064a8f412011d484d3b74bfc7 (patch) | |
| tree | 0663c7c98f748c06eeb1d67a679fc56554c40617 | |
| parent | 85a711f5a8e9aaea42595cc53998a250b0ff6469 (diff) | |
| download | samba-6b15fe247c4c026064a8f412011d484d3b74bfc7.tar.gz samba-6b15fe247c4c026064a8f412011d484d3b74bfc7.tar.xz samba-6b15fe247c4c026064a8f412011d484d3b74bfc7.zip | |
ctdb/tests/simple: Local daemons version of setup_ctdb() overrides
setup_ctdb() doesn't need to do anything on a cluster. To avoid a
conditional, just override it for local daemons.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 5 | ||||
| -rw-r--r-- | ctdb/tests/simple/scripts/local_daemons.bash | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 446c663bee..c13ee1f602 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -449,11 +449,10 @@ _restart_ctdb () fi } +# Nothing needed for a cluster. Override for local daemons. setup_ctdb () { - if [ -n "$CTDB_NODES_SOCKETS" ] ; then - daemons_setup - fi + : } restart_ctdb () diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash index 0bc62c9dd0..b286b4d5b5 100644 --- a/ctdb/tests/simple/scripts/local_daemons.bash +++ b/ctdb/tests/simple/scripts/local_daemons.bash @@ -39,7 +39,7 @@ daemons_stop () rm -rf "${TEST_VAR_DIR}/test.db" } -daemons_setup () +setup_ctdb () { mkdir -p "${TEST_VAR_DIR}/test.db/persistent" |