diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-30 10:12:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 10:12:07 -0400 |
| commit | 966b6030fa5cc31c163e344b64109eddeffc3529 (patch) | |
| tree | 4fb7cafe2e792ef2fe6408d081d350c710c5a2fa | |
| parent | 831842e520fc99ec2d4579ae806774412a78c828 (diff) | |
| parent | 5c1b3e8d7256edf248c0a753ded611d5e6fab8c0 (diff) | |
| download | podman-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
| -rw-r--r-- | test/system/410-selinux.bats | 4 | ||||
| -rw-r--r-- | test/system/420-cgroups.bats | 4 | ||||
| -rw-r--r-- | test/system/helpers.bash | 12 |
3 files changed, 17 insertions, 3 deletions
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats index 5ee0e0715..0f7c35c65 100644 --- a/test/system/410-selinux.bats +++ b/test/system/410-selinux.bats @@ -113,6 +113,10 @@ function check_label() { @test "podman selinux: shared context in (some) namespaces" { skip_if_no_selinux + # rootless users have no usable cgroups with cgroupsv1, so containers + # must use a pid namespace and not join an existing one. + skip_if_rootless_cgroupsv1 + run_podman run -d --name myctr $IMAGE top run_podman exec myctr cat -v /proc/self/attr/current context_c1="$output" 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}}' diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 28ea924bb..666735b0c 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -428,6 +428,18 @@ function skip_if_cgroupsv1() { fi } +###################### +# skip_if_rootless_cgroupsv1 # ...with an optional message +###################### +function skip_if_rootless_cgroupsv1() { + if is_rootless; then + if ! is_cgroupsv2; then + local msg=$(_add_label_if_missing "$1" "rootless cgroupvs1") + skip "${msg:-not supported as rootless under cgroupsv1}" + fi + fi +} + ################################## # skip_if_journald_unavailable # rhbz#1895105: rootless journald permissions ################################## |