diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-09-27 11:36:31 -0600 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-09-29 16:39:29 -0400 |
| commit | ddc2b9bbef9480f7e9e1f2d12ec4c9d46d52ffaa (patch) | |
| tree | 8af350a6077d51d754d1749dfd9ed87e5c9025b9 /test/system/040-ps.bats | |
| parent | b3af5a92cc710724471285fe3aa06205323a3c24 (diff) | |
| download | podman-ddc2b9bbef9480f7e9e1f2d12ec4c9d46d52ffaa.tar.gz podman-ddc2b9bbef9480f7e9e1f2d12ec4c9d46d52ffaa.tar.bz2 podman-ddc2b9bbef9480f7e9e1f2d12ec4c9d46d52ffaa.zip | |
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>
Diffstat (limited to 'test/system/040-ps.bats')
| -rw-r--r-- | test/system/040-ps.bats | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats index 182d75547..bb2971574 100644 --- a/test/system/040-ps.bats +++ b/test/system/040-ps.bats @@ -90,10 +90,18 @@ load helpers is "${#lines[@]}" "1" "setup check: no storage containers at start of test" # Force a buildah timeout; this leaves a buildah container behind + local t0=$SECONDS PODMAN_TIMEOUT=5 run_podman 124 build -t thiswillneverexist - <<EOF FROM $IMAGE RUN sleep 30 EOF + local t1=$SECONDS + local delta_t=$((t1 - t0)) + if [[ $delta_t -gt 10 ]]; then + # FIXME FIXME FIXME: when buildah issue 3544 gets fixed and vendored, + # change 'echo' to 'die' + echo "podman build did not get killed within 10 seconds (actual time: $delta_t seconds)" + fi run_podman ps -a is "${#lines[@]}" "1" "podman ps -a does not see buildah container" |