summaryrefslogtreecommitdiff
path: root/test/system/420-cgroups.bats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-30 10:12:07 -0400
committerGitHub <noreply@github.com>2021-09-30 10:12:07 -0400
commit966b6030fa5cc31c163e344b64109eddeffc3529 (patch)
tree4fb7cafe2e792ef2fe6408d081d350c710c5a2fa /test/system/420-cgroups.bats
parent831842e520fc99ec2d4579ae806774412a78c828 (diff)
parent5c1b3e8d7256edf248c0a753ded611d5e6fab8c0 (diff)
downloadpodman-966b6030fa5cc31c163e344b64109eddeffc3529.tar.gz
podman-966b6030fa5cc31c163e344b64109eddeffc3529.tar.bz2
podman-966b6030fa5cc31c163e344b64109eddeffc3529.zip
Merge pull request #11798 from giuseppe/skip-pid-shared-ns-on-rootless-cgroups-v1
test: skip test on rootless cgroupsv1
Diffstat (limited to 'test/system/420-cgroups.bats')
-rw-r--r--test/system/420-cgroups.bats4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/system/420-cgroups.bats b/test/system/420-cgroups.bats
index 89c81a742..025a20012 100644
--- a/test/system/420-cgroups.bats
+++ b/test/system/420-cgroups.bats
@@ -8,9 +8,7 @@ load helpers
@test "podman run, preserves initial --cgroup-manager" {
skip_if_remote "podman-remote does not support --cgroup-manager"
- if is_rootless && is_cgroupsv1; then
- skip "not supported as rootless under cgroups v1"
- fi
+ skip_if_rootless_cgroupsv1
# Find out our default cgroup manager, and from that, get the non-default
run_podman info --format '{{.Host.CgroupManager}}'