Implement review feedback

- document a recommended convention for fail-fast tests

- document the requirement for jq. (And, add a fail-fast
  test for its presence; remove the duplicated checks
  in subtests)

- add further sanity checks to 'help' test. Add missing
  documentation. Remove a no-longer-needed workaround for
  usage-message bug fixed in #2486

- add a documented TEMPLATE

- and, since we're at 1.1, enable 'Remote API' check in
  version test

- better diagnostics in setup/teardown; add vim filetype hint;
  better formatting of actual-vs-expect errors

- new pod-top, logs, build tests

- improve error messages

- add $IMAGE alias for ridiculous $PODMAN_TEST_IMAGE_FQN

- final cleanup, in prep for merge

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

1 files changed, 6 insertions, 4 deletions

diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats
index 775df4af6..dec2df4d5 100644
--- a/test/system/040-ps.bats
+++ b/test/system/040-ps.bats
@@ -5,20 +5,20 @@ load helpers
 @test "podman ps - basic tests" {
     rand_name=$(random_string 30)
 
-    run_podman run -d --name $rand_name $PODMAN_TEST_IMAGE_FQN sleep 5
+    run_podman run -d --name $rand_name $IMAGE sleep 5
     cid=$output
     is "$cid" "[0-9a-f]\{64\}$"
 
     # Special case: formatted ps
     run_podman ps --no-trunc \
                --format '{{.ID}} {{.Image}} {{.Command}} {{.Names}}'
-    is "$output" "$cid $PODMAN_TEST_IMAGE_FQN sleep 5 $rand_name" "podman ps"
+    is "$output" "$cid $IMAGE sleep 5 $rand_name" "podman ps"
 
 
     # Plain old regular ps
     run_podman ps
     is "${lines[1]}" \
-       "${cid:0:12} \+$PODMAN_TEST_IMAGE_FQN \+sleep [0-9]\+ .*second.* $cname"\
+       "${cid:0:12} \+$IMAGE \+sleep [0-9]\+ .*second.* $cname"\
        "output from podman ps"
 
     # OK. Wait for sleep to finish...
@@ -27,10 +27,12 @@ load helpers
     # ...then make sure container shows up as stopped
     run_podman ps -a
     is "${lines[1]}" \
-       "${cid:0:12} \+$PODMAN_TEST_IMAGE_FQN *sleep .* Exited .* $rand_name" \
+       "${cid:0:12} \+$IMAGE *sleep .* Exited .* $rand_name" \
        "podman ps -a"
 
 
 
     run_podman rm $cid
 }
+
+# vim: filetype=sh