sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

tests: simple tests against local daemons should check $TEST_LOCAL_DEAMONS

Browse Source 
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)
This commit is contained in:
Martin Schwenke 2012-07-02 14:05:21 +10:00 committed by Amitay Isaacs
parent 053174c07b
commit 959e37da7b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/tests/events.d/00.test
View File

@ -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

2
ctdb/tests/scripts/integration.bash
View File

@ -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

2
ctdb/tests/simple/11_ctdb_ip.sh
View File

@ -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