From: Martin Schwenke <martin@meltin.net>
Date: Mon, 9 Sep 2019 06:58:06 +0000 (+1000)
Subject: ctdb-tests: Don't run setup_ctdb_base() for real cluster
X-Git-Tag: talloc-2.3.1~848
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c6b098c7220a3e6d78f6040c912fc22a02f6e46;p=thirdparty%2Fsamba.git

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>
---

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