System tests: fix broken silence127

Followup to containers#20394. For years (since BATS 1.5) we've been seeing and ignoring nasty red warnings at the end of every system test run. Thanks for fixing it, @giuseppe! But it broke down in the '?' case when $expected_rc is empty: test/system/helpers.bash: line 345: [: -eq: unary operator expected Simple fix. Signed-off-by: Ed Santiago <[email protected]>
edsantiago · Oct 18, 2023 · 657029d · 657029d
1 parent 9a29eb0
commit 657029d
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
@@ -339,11 +339,15 @@ function run_podman() {
     # Remember command args, for possible use in later diagnostic messages
     MOST_RECENT_PODMAN_COMMAND="podman $*"
 
-    # BATS treats 127 as a special case, so we need to silence it when 127 is the
-    # expected rc: https://bats-core.readthedocs.io/en/stable/warnings/BW01.html
-    silence127=""
-    if [ $expected_rc -eq 127 ]; then
-       silence127="-127"
+    # BATS >= 1.5.0 treats 127 as a special case, adding a big nasty warning
+    # at the end of the test run if any command exits thus. Silence it.
+    #   https://bats-core.readthedocs.io/en/stable/warnings/BW01.html
+    local silence127=
+    if [[ "$expected_rc" = "127" ]]; then
+        # We could use "-127", but that would cause BATS to fail if the
+        # command exits any other status -- and default BATS failure messages
+        # are much less helpful than the run_podman ones. "!" is more flexible.
+        silence127="!"
     fi
 
     # stdout is only emitted upon error; this printf is to help in debugging