From ddc2b9bbef9480f7e9e1f2d12ec4c9d46d52ffaa Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Mon, 27 Sep 2021 11:36:31 -0600
Subject: 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>
---
 test/system/700-play.bats | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'test/system/700-play.bats')

diff --git a/test/system/700-play.bats b/test/system/700-play.bats
index 2b05cdd84..0785bffdf 100644
--- a/test/system/700-play.bats
+++ b/test/system/700-play.bats
@@ -69,11 +69,15 @@ RELABEL="system_u:object_r:container_file_t:s0"
     TESTDIR=$PODMAN_TMPDIR/testdir
     mkdir -p $TESTDIR
     echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml
+
     run_podman play kube - < $PODMAN_TMPDIR/test.yaml
     if [ -e /usr/sbin/selinuxenabled -a /usr/sbin/selinuxenabled ]; then
        run ls -Zd $TESTDIR
        is "$output" ${RELABEL} "selinux relabel should have happened"
     fi
+
+    run_podman stop -a -t 0
+    run_podman pod stop test_pod
     run_podman pod rm -f test_pod
 }
 
@@ -86,6 +90,9 @@ RELABEL="system_u:object_r:container_file_t:s0"
        run ls -Zd $TESTDIR
        is "$output" ${RELABEL} "selinux relabel should have happened"
     fi
+
+    run_podman stop -a -t 0
+    run_podman pod stop test_pod
     run_podman pod rm -f test_pod
 }
 
@@ -102,12 +109,19 @@ RELABEL="system_u:object_r:container_file_t:s0"
     infraID="$output"
     run_podman container inspect --format "{{.HostConfig.NetworkMode}}" $infraID
     is "$output" "slirp4netns" "network mode slirp4netns is set for the container"
+
+    run_podman stop -a -t 0
+    run_podman pod stop test_pod
     run_podman pod rm -f test_pod
+
     run_podman play kube --network none $PODMAN_TMPDIR/test.yaml
     run_podman pod inspect --format {{.InfraContainerID}} "${lines[1]}"
     infraID="$output"
     run_podman container inspect --format "{{.HostConfig.NetworkMode}}" $infraID
     is "$output" "none" "network mode none is set for the container"
+
+    run_podman stop -a -t 0
+    run_podman pod stop test_pod
     run_podman pod rm -f test_pod
 }
 
@@ -149,6 +163,9 @@ _EOF
     run_podman play kube --start=false $PODMAN_TMPDIR/test.yaml
     run_podman inspect --format "{{ .Config.User }}" test_pod-test
     is "$output" bin "expect container within pod to run as the bin user"
+
+    run_podman stop -a -t 0
+    run_podman pod stop test_pod
     run_podman pod rm -f test_pod
     run_podman rmi -f userimage:latest
 }
-- 
cgit v1.2.3-54-g00ecf