tests/tool - Restructure according to new convention

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

(This used to be ctdb commit 89571585d87b391ff79647cd1f0f6ac193079e72)

12 files changed, 13 insertions, 57 deletions

diff --git a/ctdb/tests/tool/testcases/func.parse_nodestring.001.sh b/ctdb/tests/tool/func.parse_nodestring.001.sh
index 04447cbb6a..d7caf89da9 100755
--- a/ctdb/tests/tool/testcases/func.parse_nodestring.001.sh
+++ b/ctdb/tests/tool/func.parse_nodestring.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, dd_ok, 3 healthy"
 
diff --git a/ctdb/tests/tool/testcases/func.parse_nodestring.002.sh b/ctdb/tests/tool/func.parse_nodestring.002.sh
index f5b9777af2..c89e444eaf 100755
--- a/ctdb/tests/tool/testcases/func.parse_nodestring.002.sh
+++ b/ctdb/tests/tool/func.parse_nodestring.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, dd_ok, 2 ok/1 disconnected"
 
diff --git a/ctdb/tests/tool/testcases/func.parse_nodestring.003.sh b/ctdb/tests/tool/func.parse_nodestring.003.sh
index 709bfa20e4..3e03ac4041 100755
--- a/ctdb/tests/tool/testcases/func.parse_nodestring.003.sh
+++ b/ctdb/tests/tool/func.parse_nodestring.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, current disconnected"
 
diff --git a/ctdb/tests/tool/run_tests.sh b/ctdb/tests/tool/run_tests.sh
deleted file mode 100755
index cf683228a9..0000000000
--- a/ctdb/tests/tool/run_tests.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# Run some IP allocation unit tests.
-
-cd $(dirname "$0")
-export TESTS_SUBDIR=$(pwd)
-
-test_dir=$(dirname "$TESTS_SUBDIR")
-
-opts="-d"
-
-for i ; do
-    case "$i" in
-	-v)
-	    export TESTS_VERBOSE="yes"
-	    shift
-	    ;;
-	-*)
-	    opts="$opts $i"
-	    shift
-	    ;;
-	*)
-	    break
-    esac
-done
-
-tests=""
-if [ -z "$*" ] ; then
-    tests=$(ls testcases/*.[0-9][0-9][0-9].sh 2>/dev/null)
-fi
-
-"$test_dir/scripts/run_tests" $opts "$@" $tests || exit 1
-
-echo "All OK"
-exit 0
diff --git a/ctdb/tests/tool/common.sh b/ctdb/tests/tool/scripts/local.sh
index 506c7d0c4c..fe8416ee98 100644
--- a/ctdb/tests/tool/common.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -3,14 +3,11 @@
 # Print a message and exit.
 die () { echo "$@" >&2 ; exit 1 ; }
 
-test_bin="$(dirname ${TESTS_SUBDIR})/bin"
+test_bin="$(dirname ${TEST_SUBDIR})/bin"
 
 define_test ()
 {
-    _f="$0"
-    _f="${_f#./}"  # strip leading ./
-    _f="${_f#testcases/}"  # strip leading testcases/
-    _f="${_f%.sh}" # strip off .sh suffix if any
+    _f=$(basename "$0" ".sh")
 
     case "$_f" in
 	func.*)
@@ -30,12 +27,6 @@ define_test ()
     printf "%-28s - %s\n" "$_f" "$1"
 }
 
-required_result ()
-{
-    required_rc="${1:-0}"
-    required_output=$(cat)
-}
-
 simple_test ()
 {
     _out=$($test_prog "$@" 2>&1)
@@ -54,7 +45,7 @@ simple_test ()
     fi
 
     if [ "$_fout" = "$required_output" -a $_rc = $required_rc ] ; then
-	if [ "$TESTS_VERBOSE" = "yes" ] ; then
+	if [ "$TEST_VERBOSE" = "yes" ] ; then
 	    cat <<EOF
 ##################################################
 Output (Exit status: ${_rc}):
diff --git a/ctdb/tests/tool/testcases/stubby.nodestatus.001.sh b/ctdb/tests/tool/stubby.nodestatus.001.sh
index 1d364277af..6392b8d1ec 100755
--- a/ctdb/tests/tool/testcases/stubby.nodestatus.001.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, 3 nodes, all OK"
 
diff --git a/ctdb/tests/tool/testcases/stubby.nodestatus.002.sh b/ctdb/tests/tool/stubby.nodestatus.002.sh
index 9e311b2d7d..f5b1909a07 100755
--- a/ctdb/tests/tool/testcases/stubby.nodestatus.002.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "-n all, 3 nodes, all OK"
 
diff --git a/ctdb/tests/tool/testcases/stubby.nodestatus.003.sh b/ctdb/tests/tool/stubby.nodestatus.003.sh
index 28837d0af8..a3a7a42e43 100755
--- a/ctdb/tests/tool/testcases/stubby.nodestatus.003.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, 3 nodes, 1 disconnected"
 
diff --git a/ctdb/tests/tool/testcases/stubby.nodestatus.004.sh b/ctdb/tests/tool/stubby.nodestatus.004.sh
index 0679f62aa6..bc9890590c 100755
--- a/ctdb/tests/tool/testcases/stubby.nodestatus.004.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.004.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "-n all, 3 nodes, 1 disconnected"
 
diff --git a/ctdb/tests/tool/testcases/stubby.nodestatus.005.sh b/ctdb/tests/tool/stubby.nodestatus.005.sh
index a18608dd4b..cb532e7c82 100755
--- a/ctdb/tests/tool/testcases/stubby.nodestatus.005.sh
+++ b/ctdb/tests/tool/stubby.nodestatus.005.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "-n all all, 3 nodes, 1 disconnected"
 
diff --git a/ctdb/tests/tool/testcases/stubby.status.001.sh b/ctdb/tests/tool/stubby.status.001.sh
index 74cdc39c22..48b5bac24a 100755
--- a/ctdb/tests/tool/testcases/stubby.status.001.sh
+++ b/ctdb/tests/tool/stubby.status.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, 3 nodes, all ok"
 
diff --git a/ctdb/tests/tool/testcases/stubby.status.002.sh b/ctdb/tests/tool/stubby.status.002.sh
index 77d3cc2237..fceceb30e0 100755
--- a/ctdb/tests/tool/testcases/stubby.status.002.sh
+++ b/ctdb/tests/tool/stubby.status.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${TESTS_SUBDIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all, 3 nodes, 1 unhealthy"