Revert "ctdb-tests: Make unit.sh pass shellcheck"

Fix missing Reviewed-by: tag.

This reverts commit 30293baae5f22628405d327fc0b6bae993e96cd8.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/UNIT/shellcheck/tests.sh b/ctdb/tests/UNIT/shellcheck/tests.sh
index f01ece7d456de5e41eb627eccc69a25350c096e1..715442046066c858bc44ba150f9e70c9ea4ad258 100755 (executable)
--- a/ctdb/tests/UNIT/shellcheck/tests.sh
+++ b/ctdb/tests/UNIT/shellcheck/tests.sh
@@ -21,8 +21,7 @@ shellcheck_test \
 # Includes
 shellcheck_test -s sh \
        "${TEST_SCRIPTS_DIR}/common.sh" \
-       "${TEST_SCRIPTS_DIR}/script_install_paths.sh" \
-       "${TEST_SCRIPTS_DIR}/unit.sh"
+       "${TEST_SCRIPTS_DIR}/script_install_paths.sh"
 
 shellcheck_test -s bash \
        "${TEST_SCRIPTS_DIR}/cluster.bash" \

diff --git a/ctdb/tests/scripts/unit.sh b/ctdb/tests/scripts/unit.sh
index 8affe702aaf309359173d44a5bbbcac85c4d2500..00f7fe9cb48985dc9ca3d12f02dc680431e7ca73 100644 (file)
--- a/ctdb/tests/scripts/unit.sh
+++ b/ctdb/tests/scripts/unit.sh
@@ -32,9 +32,9 @@ required_result ()
 
 required_error ()
 {
-       rc=$(errcode "$1")
+       rc=$(errcode $1)
        shift
-       required_result "$rc" "$@"
+       required_result $rc "$@"
 }
 
 ok ()
@@ -83,9 +83,7 @@ Output (Exit status: ${_rc}):
 --------------------------------------------------
 EOF
        # Avoid echo, which might expand unintentional escapes
-       printf '%s\n' "$_out" | \
-               result_filter | \
-               cat "${CTDB_TEST_CAT_RESULTS_OPTS:--}"
+       printf '%s\n' "$_out" | result_filter | cat $CTDB_TEST_CAT_RESULTS_OPTS
     fi
 
     if ! $_passed ; then
@@ -95,8 +93,7 @@ Required output (Exit status: ${required_rc}):
 --------------------------------------------------
 EOF
        # Avoid echo, which might expand unintentional escapes
-       printf '%s\n' "$required_output" | \
-               cat "${CTDB_TEST_CAT_RESULTS_OPTS:--}"
+       printf '%s\n' "$required_output" | cat $CTDB_TEST_CAT_RESULTS_OPTS
 
        if $CTDB_TEST_DIFF_RESULTS ; then
            _outr=$(mktemp)
@@ -145,8 +142,6 @@ result_filter_default ()
     _date_time_pid='[0-9/][0-9/]*\ [0-9:\.][0-9:\.]*\ \[[\ 0-9][\ 0-9]*\]'
     sed -e "s@^${_date_time_pid}:@DATE\ TIME\ \[PID\]:@"
 }
-# Used in testcases
-# shellcheck disable=SC2034
 TEST_DATE_STAMP=""
 
 # Override this function to customise output filtering.
@@ -162,7 +157,7 @@ result_check ()
     # Avoid echo, which might expand unintentional escapes
     _fout=$(printf '%s\n' "$_out" | result_filter)
 
-    if [ "$_fout" = "$required_output" ] && [ "$_rc" = "$required_rc" ] ; then
+    if [ "$_fout" = "$required_output" -a $_rc = $required_rc ] ; then
        _passed=true
     else
        _passed=false