test: make shellcheck happy again

No functional changes.

diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh
index 211bd1054717a355400bac94ec54215e52c77b1d..d8aaacb913c40c3793598a7ac067b5865843829d 100755 (executable)
--- a/test/units/testsuite-02.sh
+++ b/test/units/testsuite-02.sh
@@ -60,7 +60,7 @@ for task in "${TEST_LIST[@]}"; do
             if ! kill -0 "${running[$key]}" &>/dev/null; then
                 # Task has finished, report its result and drop it from the queue
                 wait "${running[$key]}" && ec=0 || ec=$?
-                report_result "$key" $ec
+                report_result "$key" "$ec"
                 unset "running[$key]"
                 # Break from inner for loop and outer while loop to skip
                 # the sleep below when we find a free slot in the queue
@@ -83,8 +83,8 @@ done
 # Wait for remaining running tasks
 for key in "${!running[@]}"; do
     echo "Waiting for test '$key' to finish"
-    wait ${running[$key]} && ec=0 || ec=$?
-    report_result "$key" $ec
+    wait "${running[$key]}" && ec=0 || ec=$?
+    report_result "$key" "$ec"
     unset "running[$key]"
 done
 

diff --git a/test/units/testsuite-17.02.sh b/test/units/testsuite-17.02.sh
index 22b1552653d0b97e05ca9844cf7e682771059eb8..f5b5f372d165a1472839a69e8bca3a07b14e4b10 100755 (executable)
--- a/test/units/testsuite-17.02.sh
+++ b/test/units/testsuite-17.02.sh
@@ -100,6 +100,7 @@ timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /s
 # cleanup
 ip link del hoge
 
+# shellcheck disable=SC2317
 teardown_netif_renaming_conflict() {
     set +ex
 

diff --git a/test/units/testsuite-17.03.sh b/test/units/testsuite-17.03.sh
index 318afdcb5a51dc689fa7695df659663361d9ebff..fafe9d186cf2f7b8ea38883454656c5154a59deb 100755 (executable)
--- a/test/units/testsuite-17.03.sh
+++ b/test/units/testsuite-17.03.sh
@@ -20,6 +20,7 @@ EOF
     systemctl restart systemd-udevd.service
 }
 
+# shellcheck disable=SC2317
 teardown() {
     set +e
 

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index a58112682eaf9376475199d85ec6997dfdff5cc3..4d8b94f248cf07443e44b67e852eb637694a4451 100755 (executable)
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -8,6 +8,7 @@ set -o pipefail
 
 # Coverage test for udevadm
 
+# shellcheck disable=SC2317
 cleanup_17_10() {
     set +e
 

diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh
index f2b5ab96ff425ea9883ef74b94ddf8b36f22c7f1..f1897b67852e76d1cd4ed050ef414812945637bb 100755 (executable)
--- a/test/units/testsuite-17.11.sh
+++ b/test/units/testsuite-17.11.sh
@@ -8,6 +8,7 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
+# shellcheck disable=SC2317
 cleanup() {
     cd /
     rm -rf "${workdir}"

diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh
index 2c6a384299acd7ba902ce53deb4e277116c9fe38..8cb380d2fd331f2d1c2b07374d180c2a3babd345 100755 (executable)
--- a/test/units/testsuite-35.sh
+++ b/test/units/testsuite-35.sh
@@ -468,7 +468,7 @@ test_lock_idle_action() {
     fi
 
     if loginctl --no-legend | grep -q logind-test-user; then
-        echo >&2 "Session of the \'logind-test-user\' is already present."
+        echo >&2 "Session of the 'logind-test-user' is already present."
         exit 1
     fi
 

diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh
index 9705f2db86f7606c9605f9cc0ef2318a546bdfd4..d242749b61e373c1d6a86f441e7910f606b4f7b2 100755 (executable)
--- a/test/units/testsuite-36.sh
+++ b/test/units/testsuite-36.sh
@@ -3,6 +3,7 @@
 set -eux
 set -o pipefail
 
+# shellcheck disable=SC2317
 at_exit() {
     # shellcheck disable=SC2181
     if [[ $? -ne 0 ]]; then

diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
index 1b703dc18c6b94283d64b79c8e8d981812687804..cdb7c0043b5f35f459389109ac48cbf6bec1ee4e 100755 (executable)
--- a/test/units/testsuite-50.sh
+++ b/test/units/testsuite-50.sh
@@ -7,6 +7,7 @@ set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug
 
+# shellcheck disable=SC2317
 cleanup() {(
     set +ex
 

diff --git a/test/units/testsuite-61.sh b/test/units/testsuite-61.sh
index 748e24a7ca04e5351eccd58c8bebd3eb19688b0a..0b7b0116d3c159e7a4b9938ad660b9dc2d7ab70c 100755 (executable)
--- a/test/units/testsuite-61.sh
+++ b/test/units/testsuite-61.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
+# shellcheck disable=SC2317
 set -eux
 set -o pipefail
 

diff --git a/test/units/testsuite-62.sh b/test/units/testsuite-62.sh
index 1b3b11adf117d9ac0fbe8ade86a3f065c1a4287c..8ba01f54d7b330ff685c598a89a12da9d40eb445 100755 (executable)
--- a/test/units/testsuite-62.sh
+++ b/test/units/testsuite-62.sh
@@ -21,11 +21,11 @@ setup() {
     done
 }
 
+# shellcheck disable=SC2317
 teardown() {
     set +e
 
-    for i in {0..3};
-    do
+    for i in {0..3}; do
         ip netns del "ns${i}"
         ip link del "veth${i}"
     done