diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-28 14:43:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 14:43:46 +0000 |
| commit | b0e70a6411d70d7ee7f1e9d6abedc2524b903609 (patch) | |
| tree | 6987290e36b8782fe12ff4506bdc017d4b32de60 /test/e2e/run_cgroup_parent_test.go | |
| parent | d2802636b0a7e3d281e52b44676de5e3226fbabf (diff) | |
| parent | 007c0ecd50846900eaa7b8ea2fde08c83746abda (diff) | |
| download | podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.tar.gz podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.tar.bz2 podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.zip | |
Merge pull request #7786 from rhatdan/rootless
Remove SkipIfRootless if possible, document other calls
Diffstat (limited to 'test/e2e/run_cgroup_parent_test.go')
| -rw-r--r-- | test/e2e/run_cgroup_parent_test.go | 3 |
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" |