diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-03-28 14:08:08 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-04-13 14:51:13 +1000 |
| commit | ad4d5263e7211eb63587121b11dc1c24fda816f3 (patch) | |
| tree | f4b053765c63802085393807a056891075bfe5be /ctdb | |
| parent | 68ae5f7a3e9ab20a1c73f34ee4cea3cb1f4a8d15 (diff) | |
| download | samba-ad4d5263e7211eb63587121b11dc1c24fda816f3.tar.gz samba-ad4d5263e7211eb63587121b11dc1c24fda816f3.tar.xz samba-ad4d5263e7211eb63587121b11dc1c24fda816f3.zip | |
tests: Use CTDB_TEST_REAL_CLUSTER to decide if tests use local daemons
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit d5b2ad651495f32091bd33d30871638de0de633a)
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/tests/events.d/00.test | 4 | ||||
| -rw-r--r-- | ctdb/tests/scripts/ctdb_test_functions.bash | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/tests/events.d/00.test b/ctdb/tests/events.d/00.test index daf93f804e..51c0e112ca 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 - [ `id -u` = 0 ] && { + [ -n "$CTDB_TEST_REAL_CLUSTER" ] && { /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 - [ `id -u` = 0 ] && { + [ -n "$CTDB_TEST_REAL_CLUSTER" ] && { /sbin/ip addr del $ip/$maskbits dev $iface || { echo "Failed to del $ip on dev $iface" exit 1 diff --git a/ctdb/tests/scripts/ctdb_test_functions.bash b/ctdb/tests/scripts/ctdb_test_functions.bash index c09a0672d5..063f1c3a3e 100644 --- a/ctdb/tests/scripts/ctdb_test_functions.bash +++ b/ctdb/tests/scripts/ctdb_test_functions.bash @@ -765,7 +765,7 @@ daemons_start_1 () local ctdb_options="--reclock=$var_dir/rec.lock --nlist $CTDB_NODES --nopublicipcheck --event-script-dir=$CTDB_DIR/tests/events.d --logfile=$var_dir/daemons.log -d 3 --dbdir=$var_dir/test.db --dbdir-persistent=$var_dir/test.db/persistent --dbdir-state=$var_dir/test.db/state" - if [ $(id -u) -eq 0 ]; then + if [ -z "$CTDB_TEST_REAL_CLUSTER" ]; then ctdb_options="$ctdb_options --public-interface=lo" fi |