summaryrefslogtreecommitdiff
path: root/test/e2e/run_cgroup_parent_test.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-09-25 14:14:27 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-09-27 07:55:16 -0400
commit007c0ecd50846900eaa7b8ea2fde08c83746abda (patch)
tree83dabc69d240b41a0fbecd6a3f80e723cd206240 /test/e2e/run_cgroup_parent_test.go
parent03d01abec6d028e9d5f60615b0451e42d0611d1d (diff)
downloadpodman-007c0ecd50846900eaa7b8ea2fde08c83746abda.tar.gz
podman-007c0ecd50846900eaa7b8ea2fde08c83746abda.tar.bz2
podman-007c0ecd50846900eaa7b8ea2fde08c83746abda.zip
Remove SkipIfRootless if possible, document other calls
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e/run_cgroup_parent_test.go')
-rw-r--r--test/e2e/run_cgroup_parent_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go
index 992f3eda2..b10937953 100644
--- a/test/e2e/run_cgroup_parent_test.go
+++ b/test/e2e/run_cgroup_parent_test.go
@@ -18,7 +18,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() {
)
BeforeEach(func() {
- SkipIfRootless()
+ SkipIfRootlessCgroupsV1() // cgroup parent is not supported in cgroups v1
tempdir, err = CreateTempDirInTempDir()
if err != nil {
os.Exit(1)
@@ -48,6 +48,7 @@ var _ = Describe("Podman run with --cgroup-parent", func() {
})
Specify("no --cgroup-parent", func() {
+ SkipIfRootless() // FIXME This seems to be broken in rootless mode
cgroup := "/libpod_parent"
if !Containerized() && podmanTest.CgroupManager != "cgroupfs" {
cgroup = "/machine.slice"