Revert "ctdb-tests: Make integration.bash pass shellcheck"

Fix missing Reviewed-by: tag.

This reverts commit 0f04b8a70be3b8e157a4a88e9e54e87fa380022e.

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 715442046066c858bc44ba150f9e70c9ea4ad258..088e15c5368ac66f57d70cda0a4490a299a4bc4a 100755 (executable)
--- a/ctdb/tests/UNIT/shellcheck/tests.sh
+++ b/ctdb/tests/UNIT/shellcheck/tests.sh
@@ -25,6 +25,5 @@ shellcheck_test -s sh \
 
 shellcheck_test -s bash \
        "${TEST_SCRIPTS_DIR}/cluster.bash" \
-       "${TEST_SCRIPTS_DIR}/integration.bash" \
        "${TEST_SCRIPTS_DIR}/integration_local_daemons.bash" \
        "${TEST_SCRIPTS_DIR}/integration_real_cluster.bash"

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index da0cbb154ddca973e609572ae5625c2c00762548..31f4387a404bdbb52f0edcceb8a53222f51f854a 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -7,10 +7,10 @@
 export CTDB_TIMEOUT=60
 
 if [ -n "$CTDB_TEST_REMOTE_DIR" ] ; then
-       CTDB_TEST_WRAPPER="${CTDB_TEST_REMOTE_DIR}/test_wrap"
+    CTDB_TEST_WRAPPER="${CTDB_TEST_REMOTE_DIR}/test_wrap"
 else
-       _d=$(cd "$TEST_SCRIPTS_DIR" &&  echo "$PWD")
-       CTDB_TEST_WRAPPER="$_d/test_wrap"
+    _d=$(cd ${TEST_SCRIPTS_DIR}; echo $PWD)
+    CTDB_TEST_WRAPPER="$_d/test_wrap"
 fi
 export CTDB_TEST_WRAPPER
 
@@ -153,8 +153,6 @@ try_command_on_node ()
     local cmd="$*"
 
     local status=0
-    # Intentionally unquoted - might be empty
-    # shellcheck disable=SC2086
     onnode -q $onnode_opts "$nodespec" "$cmd" >"$outfile" 2>&1 || status=$?
     out=$(dd if="$outfile" bs=1k count=1 2>/dev/null)
 
@@ -217,11 +215,11 @@ sanity_check_output ()
 
     local ret=0
 
-    local num_lines
-    num_lines=$(wc -l <"$outfile" | tr -d '[:space:]')
+    local num_lines=$(wc -l <"$outfile")
     echo "There are $num_lines lines of output"
-    if [ "$num_lines" -lt "$min_lines" ] ; then
-       ctdb_test_fail "BAD: that's less than the required number (${min_lines})"
+    if [ $num_lines -lt $min_lines ] ; then
+       echo "BAD: that's less than the required number (${min_lines})"
+       ret=1
     fi
 
     local status=0
@@ -252,7 +250,7 @@ select_test_node ()
 all_ips_on_node()
 {
     local node="$1"
-    try_command_on_node "$node" \
+    try_command_on_node $node \
        "$CTDB ip -X | awk -F'|' 'NR > 1 { print \$2, \$3 }'"
 }
 
@@ -264,8 +262,8 @@ _select_test_node_and_ips ()
     test_node=""  # this matches no PNN
     test_node_ips=""
     local ip pnn
-    while read -r ip pnn ; do
-       if [ -z "$test_node" ] && [ "$pnn" != "-1" ] ; then
+    while read ip pnn ; do
+       if [ -z "$test_node" -a "$pnn" != "-1" ] ; then
            test_node="$pnn"
        fi
        if [ "$pnn" = "$test_node" ] ; then
@@ -276,8 +274,6 @@ _select_test_node_and_ips ()
     echo "Selected node ${test_node} with IPs: ${test_node_ips}."
     test_ip="${test_node_ips%% *}"
 
-    # test_prefix used by caller
-    # shellcheck disable=SC2034
     case "$test_ip" in
        *:*) test_prefix="${test_ip}/128" ;;
        *)   test_prefix="${test_ip}/32"  ;;
@@ -292,11 +288,11 @@ select_test_node_and_ips ()
     while ! _select_test_node_and_ips ; do
        echo "Unable to find a test node with IPs assigned"
        if [ $timeout -le 0 ] ; then
-           ctdb_test_error "BAD: Too many attempts"
+           echo "BAD: Too many attempts"
            return 1
        fi
        sleep_for 1
-       timeout=$((timeout - 1))
+       timeout=$(($timeout - 1))
     done
 
     return 0
@@ -306,12 +302,12 @@ select_test_node_and_ips ()
 get_test_ip_mask_and_iface ()
 {
     # Find the interface
-    ctdb_onnode "$test_node" "ip -v -X"
-    iface=$(awk -F'|' -v ip="$test_ip" '$2 == ip { print $4 }' "$outfile")
+    try_command_on_node $test_node "$CTDB ip -v -X | awk -F'|' -v ip=$test_ip '\$2 == ip { print \$4 }'"
+    iface="$out"
 
     if ctdb_test_on_cluster ; then
        # Find the netmask
-       try_command_on_node "$test_node" ip addr show to "$test_ip"
+       try_command_on_node $test_node ip addr show to $test_ip
        mask="${out##*/}"
        mask="${mask%% *}"
     else
@@ -338,8 +334,8 @@ delete_ip_from_all_nodes ()
     _nodes=""
 
     for _pnn in $all_pnns ; do
-       all_ips_on_node "$_pnn"
-       while read -r _i _ ; do
+       all_ips_on_node $_pnn
+       while read _i _n ; do
            if [ "$_ip" = "$_i" ] ; then
                _nodes="${_nodes}${_nodes:+,}${_pnn}"
            fi
@@ -354,7 +350,7 @@ delete_ip_from_all_nodes ()
 sleep_for ()
 {
     echo -n "=${1}|"
-    for i in $(seq 1 "$1") ; do
+    for i in $(seq 1 $1) ; do
        echo -n '.'
        sleep 1
     done
@@ -378,9 +374,9 @@ _cluster_is_ready ()
 
 cluster_is_healthy ()
 {
-       if onnode 0 "$CTDB_TEST_WRAPPER" _cluster_is_healthy ; then
+       if onnode 0 $CTDB_TEST_WRAPPER _cluster_is_healthy ; then
                echo "Cluster is HEALTHY"
-               if ! onnode 0 "$CTDB_TEST_WRAPPER" _cluster_is_recovered ; then
+               if ! onnode 0 $CTDB_TEST_WRAPPER _cluster_is_recovered ; then
                        echo "WARNING: cluster in recovery mode!"
                fi
                return 0
@@ -405,7 +401,7 @@ wait_until_ready ()
 
     echo "Waiting for cluster to become ready..."
 
-    wait_until "$timeout" onnode -q any "$CTDB_TEST_WRAPPER" _cluster_is_ready
+    wait_until $timeout onnode -q any $CTDB_TEST_WRAPPER _cluster_is_ready
 }
 
 # This function is becoming nicely overloaded.  Soon it will collapse!  :-)
@@ -442,13 +438,13 @@ node_has_status ()
                echo "node_has_status: unknown status \"$status\""
                return 1
        esac
-       local out _ line
+       local out x line
 
        out=$($CTDB -X status 2>&1) || return 1
 
        {
-               read -r _
-               while read -r line ; do
+               read x
+               while read line ; do
                        # This needs to be done in 2 steps to
                        # avoid false matches.
                        local line_bits="${line#|${pnn}|*|}"
@@ -469,9 +465,7 @@ wait_until_node_has_status ()
 
     echo "Waiting until node $pnn has status \"$status\"..."
 
-    if ! wait_until "$timeout" onnode "$proxy_pnn" \
-        "$CTDB_TEST_WRAPPER" node_has_status "$pnn" "$status" ; then
-
+    if ! wait_until $timeout onnode $proxy_pnn $CTDB_TEST_WRAPPER node_has_status "$pnn" "$status" ; then
        for i in "onnode -q any $CTDB status" "onnode -q any onnode all $CTDB scriptstatus" ; do
            echo "$i"
            $i || true
@@ -496,12 +490,12 @@ ips_are_on_node ()
 
     local out
 
-    all_ips_on_node "$node"
+    all_ips_on_node $node
 
     local check
     for check in $ips ; do
        local ip pnn
-       while read -r ip pnn ; do
+       while read ip pnn ; do
            if [ "$check" = "$ip" ] ; then
                if [ "$pnn" = "$node" ] ; then
                    if $negating ; then return 1 ; fi
@@ -552,9 +546,9 @@ node_has_some_ips ()
 
     local out
 
-    all_ips_on_node "$node"
+    all_ips_on_node $node
 
-    while read -r ip pnn ; do
+    while read ip pnn ; do
        if [ "$node" = "$pnn" ] ; then
            return 0
        fi
@@ -585,7 +579,7 @@ ctdb_init ()
 
        ctdb_nodes_start || ctdb_test_error "Cluster start failed"
 
-       wait_until_ready 120 || ctdb_test_error "Cluster didn't become ready"
+       wait_until_ready || ctdb_test_error "Cluster didn't become ready"
 
        echo "Setting RerecoveryTimeout to 1"
        onnode -pq all "$CTDB setvar RerecoveryTimeout 1"
@@ -626,7 +620,7 @@ wait_for_monitor_event ()
 
     echo "Waiting for a monitor event on node ${pnn}..."
 
-    ctdb_onnode "$pnn" scriptstatus || {
+    try_command_on_node "$pnn" $CTDB scriptstatus || {
        echo "Unable to get scriptstatus from node $pnn"
        return 1
     }
@@ -638,7 +632,7 @@ wait_for_monitor_event ()
 
 _ctdb_scriptstatus_changed ()
 {
-    ctdb_onnode "$pnn" scriptstatus || {
+    try_command_on_node "$pnn" $CTDB scriptstatus || {
        echo "Unable to get scriptstatus from node $pnn"
        return 1
     }
@@ -658,8 +652,6 @@ ip_maskbits_iface ()
        *)   _family="inet"  ; _bits=32  ;;
     esac
 
-    # Literal backslashes in awk script
-    # shellcheck disable=SC1004
     ip addr show to "${_addr}/${_bits}" 2>/dev/null | \
        awk -v family="${_family}" \
            'NR == 1 { iface = $2; sub(":$", "", iface) } \
@@ -671,8 +663,6 @@ drop_ip ()
 {
     _addr="${1%/*}"  # Remove optional maskbits
 
-    # Intentional word splitting
-    # shellcheck disable=SC2046,SC2086
     set -- $(ip_maskbits_iface $_addr)
     if [ -n "$1" ] ; then
        _maskbits="$1"
@@ -694,7 +684,8 @@ drop_ips ()
 # $1: pnn, $2: DB name
 db_get_path ()
 {
-       ctdb_onnode -v "$1" "getdbstatus $2" | sed -n -e "s@^path: @@p"
+    try_command_on_node -v $1 $CTDB getdbstatus "$2" |
+    sed -n -e "s@^path: @@p"
 }
 
 # $1: pnn, $2: DB name
@@ -704,16 +695,17 @@ db_ctdb_cattdb_count_records ()
        # This excludes at least the sequence number record in
        # persistent/replicated databases.  The trailing "|| :" forces
        # the command to succeed when no records are matched.
-       ctdb_onnode "$1" "cattdb $2 | grep -c '^key([0-9][0-9]*) = \"[^_]' || :"
+       try_command_on_node $1 \
+               "$CTDB cattdb $2 | grep -c '^key([0-9][0-9]*) = \"[^_]' || :"
        echo "$out"
 }
 
 # $1: pnn, $2: DB name, $3: key string, $4: value string, $5: RSN (default 7)
 db_ctdb_tstore ()
 {
-    _tdb=$(db_get_path "$1" "$2")
+    _tdb=$(db_get_path $1 "$2")
     _rsn="${5:-7}"
-    ctdb_onnode "$1" tstore "$_tdb" "$3" "$4" "$_rsn"
+    try_command_on_node $1 $CTDB tstore "$_tdb" "$3" "$4" "$_rsn"
 }
 
 # $1: pnn, $2: DB name, $3: dbseqnum (must be < 255!!!!!)
@@ -724,17 +716,15 @@ db_ctdb_tstore_dbseqnum ()
 
     # Construct 8 byte (unit64_t) database sequence number.  This
     # probably breaks if $3 > 255
-    _value=$(printf "0x%02x%014x" "$3" 0)
+    _value=$(printf "0x%02x%014x" $3 0)
 
-    db_ctdb_tstore "$1" "$2" "$_key" "$_value"
+    db_ctdb_tstore $1 "$2" "$_key" "$_value"
 }
 
 ########################################
 
 # Make sure that $CTDB is set.
-if [ -z "$CTDB" ] ; then
-       CTDB="ctdb"
-fi
+: ${CTDB:=ctdb}
 
 if ctdb_test_on_cluster ; then
        . "${TEST_SCRIPTS_DIR}/integration_real_cluster.bash"