tests: simple tests against local daemons should check $TEST_LOCAL_DEAMONS

Note the old $CTDB_TEST_REAL_CLUSTER - it doesn't exist anymore...

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 47180dc75d15f3d61470705603565b718491c9f8)

diff --git a/ctdb/tests/events.d/00.test b/ctdb/tests/events.d/00.test
index 51c0e112cadc59ab0422d957546cd4f16d9b1254..e3e15eb730113f04f2559e4d77064c2759648ff9 100755 (executable)
--- a/ctdb/tests/events.d/00.test
+++ b/ctdb/tests/events.d/00.test
@@ -43,7 +43,7 @@ case $cmd in
        ip=$2
        maskbits=$3
 
-       [ -n "$CTDB_TEST_REAL_CLUSTER" ] && {
+       [ -n "$TEST_LOCAL_DAEMONS" ] || {
            /sbin/ip addr add $ip/$maskbits dev $iface || {
                echo "Failed to add $ip/$maskbits on dev $iface"
                exit 1
@@ -64,7 +64,7 @@ case $cmd in
        iface=$1
        ip=$2
        maskbits=$3
-       [ -n "$CTDB_TEST_REAL_CLUSTER" ] && {
+       [ -n "$TEST_LOCAL_DAEMONS" ] || {
            /sbin/ip addr del $ip/$maskbits dev $iface || {
                echo "Failed to del $ip on dev $iface"
                exit 1

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index e3301f283cf687a5c6e3d74e83abfcff625e4875..52291840667ad04f7878ab8f34457dfe3701a34b 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -559,7 +559,7 @@ daemons_start_1 ()
     local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES")
     local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state"
 
-    if [ -z "$CTDB_TEST_REAL_CLUSTER" ]; then
+    if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
         ctdb_options="$ctdb_options --public-interface=lo"
     fi
 

diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/simple/11_ctdb_ip.sh
index 2f39061acd9f2498bfb0d9b1d21c38997f278f43..c1aec0e9bd7bc1923e7fe78d00721d2256cb0a6f 100755 (executable)
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/ctdb/tests/simple/11_ctdb_ip.sh
@@ -41,7 +41,7 @@ machineout=$(echo "$out" | sed -r \
        -e 's@[[:alpha:]]+\[@@g' \
        -e 's@\]@@g')
 
-if [ -n "$CTDB_TEST_REAL_CLUSTER" ]; then
+if [ -z "$TEST_LOCAL_DAEMONS" ]; then
     while read ip pnn ; do
         try_command_on_node $pnn "ip addr show"
         if [ "${out/inet ${ip}\/}" != "$out" ] ; then