ctdb-tests: Use setup_ctdb_base() for onnode unit tests

The nodes file is now in the CTDB_BASE directory so no CTDB_NODES_FILE
variable is needed.

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

diff --git a/ctdb/tests/onnode/nodes b/ctdb/tests/onnode/etc-ctdb/nodes
similarity index 100%
rename from ctdb/tests/onnode/nodes
rename to ctdb/tests/onnode/etc-ctdb/nodes

diff --git a/ctdb/tests/onnode/functions b/ctdb/tests/onnode/functions
deleted file mode 120000 (symlink)
index ff10411..0000000
--- a/ctdb/tests/onnode/functions
+++ /dev/null
@@ -1 +0,0 @@
-../../config/functions
\ No newline at end of file

diff --git a/ctdb/tests/onnode/scripts/local.sh b/ctdb/tests/onnode/scripts/local.sh
index 27fece87ec50fe4c670ca63ae4e8024a14e16a12..337fad1e96461b26519d5af15c7a3f4b3da4ae5e 100644 (file)
--- a/ctdb/tests/onnode/scripts/local.sh
+++ b/ctdb/tests/onnode/scripts/local.sh
@@ -8,23 +8,15 @@ stubs_dir="${TEST_SUBDIR}/stubs"
 [ -d "${stubs_dir}" ] || die "Failed to locate stubs/ subdirectory"
 PATH="${stubs_dir}:${PATH}"
 
-# Find CTDB nodes file.
-if [ -z "$CTDB_NODES_FILE" ] ; then
-    if [ -r "${TEST_SUBDIR}/nodes" ] ; then
-       CTDB_NODES_FILE="${TEST_SUBDIR}/nodes"
-    else
-       CTDB_NODES_FILE="${CTDB_BASE:-/etc/ctdb}/nodes"
-    fi
-fi
-
-export CTDB_NODES_FILE
-
+[ -n "$TEST_VAR_DIR" ] || die "TEST_VAR_DIR unset"
 export ONNODE_TESTS_VAR_DIR="${TEST_VAR_DIR}/unit_onnode"
+if [ -d "$ONNODE_TESTS_VAR_DIR" ] ; then
+       rm -r "$ONNODE_TESTS_VAR_DIR"
+fi
 mkdir -p "$ONNODE_TESTS_VAR_DIR"
 
-if [ -z "$CTDB_BASE" ] ; then
-    export CTDB_BASE=$(dirname "$CTDB_NODES_FILE")
-fi
+setup_ctdb_base "$ONNODE_TESTS_VAR_DIR" "etc-ctdb" \
+               functions
 
 define_test ()
 {

diff --git a/ctdb/wscript b/ctdb/wscript
index f9523a64c6169eeda9d61751f0dcb033aa1afb3d..d49f08257c59e31787f0fcac235306617b988e19 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -946,8 +946,6 @@ def build(bld):
 
     # Tests that use onnode need to overwrite link to in-tree
     # functions file when installed
-    bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'onnode/functions'),
-                   os.path.join(bld.env.CTDB_ETCDIR, 'functions'))
     bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'simple/functions'),
                    os.path.join(bld.env.CTDB_ETCDIR, 'functions'))