System tests: speed up. They've gotten too slow.

 - logs: remove unnecessary sleeps. This saves ~25s.
   Unfortunately, journald seems to have some sort of lag,
   so we need to keep retrying until we get the 'after' string.

 - ps: add placeholder test for once buildah 3544 is fixed

 - cp: bulk-kill containers when finished, instead of one by one.
   This is a big change and only saves about 8s per run, but hey.

 - mount,pause,healthcheck: 'podman stop -t 0' before rm'ing containers.
   Easy 50s.
   Have I mentioned, lately, that 'podman rm -f' needs a '-t 0' flag?

 - play: same, and also 'podman pod stop'. Seems to shave ~20s.

 - socket-activation: UGH! Buggy and useless tests! They were
   running "sleep 90" containers for no reason whatsoever. I
   assume the intention was to run them with "-d", so that's
   what I've done here. Also fixed some language. 180 seconds!

(Unrelated: cleanup in 070-build, use $IMAGE, not alpine)

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

1 files changed, 17 insertions, 7 deletions

diff --git a/test/system/270-socket-activation.bats b/test/system/270-socket-activation.bats
index 031ba161b..dd439d3ae 100644
--- a/test/system/270-socket-activation.bats
+++ b/test/system/270-socket-activation.bats
@@ -69,26 +69,36 @@ function teardown() {
 
 @test "podman system service - socket activation - no container" {
     run curl -s --max-time 3 --unix-socket $SERVICE_SOCK_ADDR http://podman/libpod/_ping
-    is "$output" "OK" "podman service responses normally"
+    is "$output" "OK" "podman service responds normally"
 }
 
-@test "podman system service - socket activation - exist container " {
-    run_podman run $IMAGE sleep 90
+@test "podman system service - socket activation - existing container" {
+    run_podman run -d $IMAGE sleep 90
+    cid="$output"
+
     run curl -s --max-time 3 --unix-socket $SERVICE_SOCK_ADDR http://podman/libpod/_ping
-    is "$output" "OK" "podman service responses normally"
+    is "$output" "OK" "podman service responds normally"
+
+    run_podman stop -t 0 $cid
+    run_podman rm -f $cid
 }
 
-@test "podman system service - socket activation - kill rootless pause " {
+@test "podman system service - socket activation - kill rootless pause" {
     if ! is_rootless; then
         skip "root podman no need pause process"
     fi
-    run_podman run $IMAGE sleep 90
+    run_podman run -d $IMAGE sleep 90
+    cid="$output"
+
     local pause_pid="$XDG_RUNTIME_DIR/libpod/tmp/pause.pid"
     if [ -f $pause_pid ]; then
         kill -9 $(cat $pause_pid) 2> /dev/null
     fi
     run curl -s --max-time 3 --unix-socket $SERVICE_SOCK_ADDR http://podman/libpod/_ping
-    is "$output" "OK" "podman service responses normally"
+    is "$output" "OK" "podman service responds normally"
+
+    run_podman stop -t 0 $cid
+    run_podman rm -f $cid
 }
 
 # vim: filetype=sh