aboutsummaryrefslogtreecommitdiff
path: root/test/system/420-cgroups.bats
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-09-14 05:33:36 -0600
committerEd Santiago <santiago@redhat.com>2022-09-14 10:49:18 -0600
commitd4a62ff9324b57f620a4cb03c8dcdae3a6540cb0 (patch)
treebd51f66a8074b375294235a9484c0b3f289d5c35 /test/system/420-cgroups.bats
parent017d81ddd0e8d228aadb949175c0aae1e4b9d925 (diff)
downloadpodman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.tar.gz
podman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.tar.bz2
podman-d4a62ff9324b57f620a4cb03c8dcdae3a6540cb0.zip
System tests: fix three races
Three tests were running 'container rm' on 'start'ed containers that might not yet have exited. Fix. Also, tighten up the tests themselves, to make even more sure that they test what they're supposed to test. Discovered, in CI, that 'podman-remote logs --timestamps' was unimplemented. Thanks to @Luap99 for the fix to that. Fixes: #15783 Fixes: #15795 Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/420-cgroups.bats')
-rw-r--r--test/system/420-cgroups.bats5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/system/420-cgroups.bats b/test/system/420-cgroups.bats
index 025a20012..3269f666c 100644
--- a/test/system/420-cgroups.bats
+++ b/test/system/420-cgroups.bats
@@ -19,6 +19,8 @@ load helpers
esac
run_podman --cgroup-manager=$other run --name myc $IMAGE true
+ assert "$output" = "" "run true, with cgroup-manager=$other, is silent"
+
run_podman container inspect --format '{{.HostConfig.CgroupManager}}' myc
is "$output" "$other" "podman preserved .HostConfig.CgroupManager"
@@ -29,7 +31,8 @@ load helpers
# Restart the container, without --cgroup-manager option (ie use default)
# Prior to #7970, this would fail with an OCI runtime error
- run_podman start myc
+ run_podman start -a myc
+ assert "$output" = "" "restarted container emits no output"
run_podman rm myc
}