diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-07-02 14:05:21 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-07-26 22:03:00 +1000 |
| commit | 959e37da7bbdfa47f7e4fd6e9b92dbac1f9dea58 (patch) | |
| tree | 979cc5bac7404107ba916c079a40b105a488f0c6 | |
| parent | 053174c07bc0fb5e5563d5023b71007390c7762f (diff) | |
| download | samba-959e37da7bbdfa47f7e4fd6e9b92dbac1f9dea58.tar.gz samba-959e37da7bbdfa47f7e4fd6e9b92dbac1f9dea58.tar.xz samba-959e37da7bbdfa47f7e4fd6e9b92dbac1f9dea58.zip | |
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)
| -rwxr-xr-x | ctdb/tests/events.d/00.test | 4 | ||||
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 2 | ||||
| -rwxr-xr-x | ctdb/tests/simple/11_ctdb_ip.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/tests/events.d/00.test b/ctdb/tests/events.d/00.test index 51c0e112ca..e3e15eb730 100755 --- 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 e3301f283c..5229184066 100644 --- 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 2f39061acd..c1aec0e9bd 100755 --- 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 |