system tests: add assert(), and start using it

Problem: the system test 'is()' checker was poorly thought out.
For example, there is no way to check for inequality or for
absence of a substring.

Solution, step 1: introduce new assert(), copied almost verbatim
from buildah, where it has been successful in addressing the
gaps in is().

The logical next step is to search the tests for 'die' and
for 'run', looking for negative assertions which we can
replace with assert(). There were a lot, and in the process
I found a number of ugly bugs in the tests themselves. I've
taken the liberty of fixing these.

Important note: at this time we have both assert() and is().
Replacing all instances of is() would be impossible to review.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/test/system/015-help.bats b/test/system/015-help.bats
index 4eeea85bf..5757d51dc 100644
--- a/test/system/015-help.bats
+++ b/test/system/015-help.bats
@@ -27,7 +27,7 @@ function check_help() {
 
         # The line immediately after 'Usage:' gives us a 1-line synopsis
         usage=$(echo "$full_help" | grep -A1 '^Usage:' | tail -1)
-        [ -n "$usage" ] || die "podman $cmd: no Usage message found"
+        assert "$usage" != "" "podman $cmd: no Usage message found"
 
         # e.g. 'podman ps' should not show 'podman container ps' in usage
         # Trailing space in usage handles 'podman system renumber' which
@@ -42,14 +42,12 @@ function check_help() {
         fi
 
         # We had someone write upper-case '[OPTIONS]' once. Prevent it.
-        if expr "$usage" : '.*\[OPTION' >/dev/null; then
-            die "'options' string must be lower-case in usage: $usage"
-        fi
+        assert "$usage" !~ '\[OPTION' \
+               "'options' string must be lower-case in usage"
 
         # We had someone do 'podman foo ARG [options]' one time. Yeah, no.
-        if expr "$usage" : '.*[A-Z].*\[option' >/dev/null; then
-            die "'options' must precede arguments in usage: $usage"
-        fi
+        assert "$usage" !~ '[A-Z].*\[option' \
+               "'options' must precede arguments in usage"
 
         # Cross-check: if usage includes '[options]', there must be a
         # longer 'Options:' section in the full --help output; vice-versa,
@@ -169,16 +167,15 @@ function check_help() {
 
     # This can happen if the output of --help changes, such as between
     # the old command parser and cobra.
-    [ $count -gt 0 ] || \
-        die "Internal error: no commands found in 'podman help $@' list"
+    assert "$count" -gt 0 \
+           "Internal error: no commands found in 'podman help $*' list"
 
     # Sanity check: make sure the special loops above triggered at least once.
     # (We've had situations where a typo makes the conditional never run)
     if [ -z "$*" ]; then
         for i in subcommands required_args takes_no_args fixed_args; do
-            if [[ -z ${found[$i]} ]]; then
-                die "Internal error: '$i' subtest did not trigger"
-            fi
+            assert "${found[$i]}" != "" \
+                   "Internal error: '$i' subtest did not trigger"
         done
     fi
 }