From: Martin Schwenke <martin@meltin.net>
Date: Thu, 5 Sep 2019 05:47:13 +0000 (+1000)
Subject: ctdb-tests: Use local_daemons.sh onnode for local daemons tests
X-Git-Tag: talloc-2.3.1~736
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f331f3f723a4e26af2d5c356cb9b72d062df6311;p=thirdparty%2Fsamba.git

ctdb-tests: Use local_daemons.sh onnode for local daemons tests

With some upcoming changes, the setting of CTDB_BASE becomes
problematic because it will be included unconditionally whereas it is
currently being conveniently and almost accidentally not include in
some contexts.

So, instead of trying to coerce onnode into behaving as desired, have
the local daemons tests use local_daemons.sh onnode directly.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 95af943f6d7..07284f71286 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -12,9 +12,6 @@ fi
 
 ctdb_local_daemons="${helper} ${SIMPLE_TESTS_VAR_DIR}"
 
-# onnode will execute this, which fakes ssh against local daemons
-export ONNODE_SSH="${ctdb_local_daemons} ssh"
-
 #######################################
 
 setup_ctdb ()
@@ -74,5 +71,7 @@ restart_ctdb_1 ()
 	start_ctdb_1 "$1"
 }
 
-# onnode just needs the nodes file, so use the common one
-export CTDB_BASE="$SIMPLE_TESTS_VAR_DIR"
+onnode ()
+{
+	$ctdb_local_daemons onnode "$@"
+}