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

This makes global changes easier.

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

diff --git a/ctdb/tests/onnode/0001.sh b/ctdb/tests/onnode/0001.sh
index 6c86ac1212ed979b8319ea5fcaa629687c3e1b98..3c2d541ef4cfbeed88794ec4debdd1438bf1abc9 100755 (executable)
--- a/ctdb/tests/onnode/0001.sh
+++ b/ctdb/tests/onnode/0001.sh
@@ -4,7 +4,7 @@
 
 cmd="$ONNODE all hostname"
 
-echo "$cmd - all nodes OK"
+define_test "$cmd" "all nodes OK"
 
 required_result <<EOF
 

diff --git a/ctdb/tests/onnode/0002.sh b/ctdb/tests/onnode/0002.sh
index e8e082daeccd4b7f2fe270032bc7f04b7e4ba27f..b18d91efa2cf54cbaa3e708df9d387649c326328 100755 (executable)
--- a/ctdb/tests/onnode/0002.sh
+++ b/ctdb/tests/onnode/0002.sh
@@ -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

diff --git a/ctdb/tests/onnode/0003.sh b/ctdb/tests/onnode/0003.sh
index 7e55c6015fdbfe98d756a109ae990961673b96a6..d92579926138467e0a0fcf71fbc434ba42e2831c 100755 (executable)
--- a/ctdb/tests/onnode/0003.sh
+++ b/ctdb/tests/onnode/0003.sh
@@ -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

diff --git a/ctdb/tests/onnode/0004.sh b/ctdb/tests/onnode/0004.sh
index daa6794811eb756eb23b2b53142547b8d368a083..a6e6424acef8a728f65a157707ccbfe3034b251e 100755 (executable)
--- a/ctdb/tests/onnode/0004.sh
+++ b/ctdb/tests/onnode/0004.sh
@@ -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

diff --git a/ctdb/tests/onnode/0005.sh b/ctdb/tests/onnode/0005.sh
index bb82166f3c413e34291d8ef2305eac264271feab..af237da9a313e648ff7e24b4f0c5f13d6070ecca 100755 (executable)
--- a/ctdb/tests/onnode/0005.sh
+++ b/ctdb/tests/onnode/0005.sh
@@ -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

diff --git a/ctdb/tests/onnode/0006.sh b/ctdb/tests/onnode/0006.sh
index 2960061d46d713fc040a32e3b41f4499d31f5248..aa6eeba89eb5f19557f77c5435b1cf9fe8972276 100755 (executable)
--- a/ctdb/tests/onnode/0006.sh
+++ b/ctdb/tests/onnode/0006.sh
@@ -4,7 +4,7 @@
 
 cmd="$ONNODE -v 3 hostname"
 
-echo "$cmd - all nodes OK"
+define_test "$cmd" "all nodes OK"
 
 required_result <<EOF
 

diff --git a/ctdb/tests/onnode/0070.sh b/ctdb/tests/onnode/0070.sh
index 758298124f56c6517186e84db0e1e4af4e5da092..f38c95f5fd86a733494410bfc2b61b656ecfaa32 100755 (executable)
--- a/ctdb/tests/onnode/0070.sh
+++ b/ctdb/tests/onnode/0070.sh
@@ -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:

diff --git a/ctdb/tests/onnode/0071.sh b/ctdb/tests/onnode/0071.sh
index 3c0a7748e98ae10e7beea645e8d0628a612bba65..8a1cb59dd76fe54b769b9ebe1a375edfa4395cb6 100755 (executable)
--- a/ctdb/tests/onnode/0071.sh
+++ b/ctdb/tests/onnode/0071.sh
@@ -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

diff --git a/ctdb/tests/onnode/0072.sh b/ctdb/tests/onnode/0072.sh
index a8c7d0732929f4ebfb00b458155a442fcb60ef63..d80361a4354c01d3d88fffafa191e109ded42b18 100755 (executable)
--- a/ctdb/tests/onnode/0072.sh
+++ b/ctdb/tests/onnode/0072.sh
@@ -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:

diff --git a/ctdb/tests/onnode/0075.sh b/ctdb/tests/onnode/0075.sh
index 8315f78dbf4e4d330528eaee5827f91cd6459c38..aa2e8be0babaa335a0cb579148cb8878e9c0fe16 100755 (executable)
--- a/ctdb/tests/onnode/0075.sh
+++ b/ctdb/tests/onnode/0075.sh
@@ -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:

diff --git a/ctdb/tests/onnode/0080.sh b/ctdb/tests/onnode/0080.sh
index f04155455da60057b83e0ff33d8da07eafd47341..095f65b224e891b6f52f397676008ab1d6e67f3b 100755 (executable)
--- a/ctdb/tests/onnode/0080.sh
+++ b/ctdb/tests/onnode/0080.sh
@@ -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

diff --git a/ctdb/tests/onnode/0081.sh b/ctdb/tests/onnode/0081.sh
index c31af289d645664f39a449e4f334093c605eb536..e593934f664cb73a2e98eca7f03a061edf9dcbca 100755 (executable)
--- a/ctdb/tests/onnode/0081.sh
+++ b/ctdb/tests/onnode/0081.sh
@@ -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

diff --git a/ctdb/tests/onnode/0090.sh b/ctdb/tests/onnode/0090.sh
index c64c1587c989d13bd22dba47d928fecd7f645e6e..1147e34c10924e627c053aa7e06ee8d68806dbf7 100755 (executable)
--- a/ctdb/tests/onnode/0090.sh
+++ b/ctdb/tests/onnode/0090.sh
@@ -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

diff --git a/ctdb/tests/onnode/0091.sh b/ctdb/tests/onnode/0091.sh
index 947760647aaa34c9e2a978e08b1a7f7a89afb8e8..5239eef1b47f3f2e0244d0e347937487cb7468cb 100755 (executable)
--- a/ctdb/tests/onnode/0091.sh
+++ b/ctdb/tests/onnode/0091.sh
@@ -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

diff --git a/ctdb/tests/onnode/common.sh b/ctdb/tests/onnode/common.sh
index bbdbce4777bfbde3b64aa1d012b5eccb78645183..e4cca321627e846c963521bdc4257ed43fe9d15c 100644 (file)
--- a/ctdb/tests/onnode/common.sh
+++ b/ctdb/tests/onnode/common.sh
@@ -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 ()
 {