sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

Tests: onnode tests changed to use a simple define_test() function.

Browse Source 
This makes global changes easier.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 3af086398fecb5f7c501190f9620b9c7b201f0ca)
This commit is contained in:
Martin Schwenke 2011-06-07 16:05:48 +10:00
parent 51ef4b4e55
commit 3ee6a63e47
15 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/onnode/0001.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE all hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF

2
ctdb/tests/onnode/0002.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE -q all hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF
-n 192.168.1.101 hostname

2
ctdb/tests/onnode/0003.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE -p all hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF
[192.168.1.101] -n 192.168.1.101 hostname

2
ctdb/tests/onnode/0004.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE -pq all hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF
-n 192.168.1.101 hostname

2
ctdb/tests/onnode/0005.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE 3 hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF
-n 192.168.1.104 hostname

2
ctdb/tests/onnode/0006.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE -v 3 hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
required_result <<EOF

2
ctdb/tests/onnode/0070.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE ok hostname"
echo "$cmd - all nodes OK"
define_test "$cmd" "all nodes OK"
ctdb_set_output <<EOF
:Node:IP:Disconnected:Banned:Disabled:Unhealthy:Stopped:Inactive:

2
ctdb/tests/onnode/0071.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE ok hostname"
echo "$cmd - 2nd node disconnected"
define_test "$cmd" "2nd node disconnected"
ctdb_set_output <<EOF
ctdb_set_output <<EOF

2
ctdb/tests/onnode/0072.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE ok hostname"
echo "$cmd - 2nd node disconnected, extra status columns"
define_test "$cmd" "2nd node disconnected, extra status columns"
ctdb_set_output <<EOF
:Node:IP:Disconnected:Banned:Disabled:Unhealthy:Stopped:Inactive:X1:X2:X3:X4:

2
ctdb/tests/onnode/0075.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE con hostname"
echo "$cmd - 1st node disconnected"
define_test "$cmd" "1st node disconnected"
ctdb_set_output <<EOF
:Node:IP:Disconnected:Banned:Disabled:Unhealthy:Stopped:Inactive:

2
ctdb/tests/onnode/0080.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE recmaster hostname"
echo "$cmd - node 1 (192.168.1.102) is recmaster"
define_test "$cmd" "node 1 (192.168.1.102) is recmaster"
ctdb_set_output <<EOF
1

2
ctdb/tests/onnode/0081.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE lvsmaster hostname"
echo "$cmd - no lvsmaster"
define_test "$cmd" "no lvsmaster"
ctdb_set_output 255 <<EOF
There is no LVS master

2
ctdb/tests/onnode/0090.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE natgw hostname"
echo "$cmd - no natgw"
define_test "$cmd" "no natgw"
ctdb_set_output <<EOF
-1 0.0.0.0

2
ctdb/tests/onnode/0091.sh
View File

@ -4,7 +4,7 @@
cmd="$ONNODE natgw hostname"
echo "$cmd - node 2 (192.168.1.103) is natgw"
define_test "$cmd" "node 2 (192.168.1.103) is natgw"
ctdb_set_output <<EOF
2 192.168.1.103

10
ctdb/tests/onnode/common.sh
View File

@ -42,6 +42,16 @@ if [ -z "$CTDB_BASE" ] ; then
export CTDB_BASE=$(dirname "$CTDB_NODES_FILE")
fi
define_test ()
{
_f="$0"
_f="${_f#./}" # strip leading ./
_f="${_f%%/*}" # if subdir, strip off file
_f="${_f%.sh}" # strip off .sh suffix if any
echo "$_f $1 - $2"
}
# Set output for ctdb command. Option 1st argument is return code.
ctdb_set_output ()
{