diff options
| -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" |