diff options
author | Martin Schwenke <martin@meltin.net> | 2019-09-09 16:58:06 +1000 |
---|---|---|
committer | Amitay Isaacs <amitay@samba.org> | 2019-09-17 04:35:26 +0000 |
commit | 2c6b098c7220a3e6d78f6040c912fc22a02f6e46 (patch) | |
tree | 0eae2c065906af0860546ea8808185dccaa817e9 /ctdb/tests/simple | |
parent | 8aed06ce8c802d75e7bacb289916c835164e7307 (diff) | |
download | samba-2c6b098c7220a3e6d78f6040c912fc22a02f6e46.tar.gz |
ctdb-tests: Don't run setup_ctdb_base() for real cluster
This has not been needed for some time.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/simple')
-rw-r--r-- | ctdb/tests/simple/scripts/local.bash | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ctdb/tests/simple/scripts/local.bash b/ctdb/tests/simple/scripts/local.bash index 7b4a4f030df..5ffe2892c5c 100644 --- a/ctdb/tests/simple/scripts/local.bash +++ b/ctdb/tests/simple/scripts/local.bash @@ -6,11 +6,6 @@ export SIMPLE_TESTS_VAR_DIR="${TEST_VAR_DIR}/simple" # Don't remove old directory since state is retained between tests mkdir -p "$SIMPLE_TESTS_VAR_DIR" -if [ -z "$TEST_LOCAL_DAEMONS" ] ; then - # Running against a real cluster - setup_ctdb_base "$SIMPLE_TESTS_VAR_DIR" "ctdb-etc" \ - functions \ - nodes -else +if [ -n "$TEST_LOCAL_DAEMONS" ] ; then . "${TEST_SUBDIR}/scripts/local_daemons.bash" fi |