diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-14 10:22:49 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-14 11:43:45 +0200 |
| commit | 65f3b16c67d96aaf3d27da6df5c538057a9bb224 (patch) | |
| tree | 074f0fc4dbe2a2c5a43b1948fe7fa52b6d1b5f5d | |
| parent | afe4d17be83ccdd1292f3a63bc4d71fb0e5430b6 (diff) | |
| download | podman-65f3b16c67d96aaf3d27da6df5c538057a9bb224.tar.gz podman-65f3b16c67d96aaf3d27da6df5c538057a9bb224.tar.bz2 podman-65f3b16c67d96aaf3d27da6df5c538057a9bb224.zip | |
tests: enable --cgroups=disabled test for rootless
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | test/e2e/run_test.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index cf1ce699e..cb61aba21 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -11,6 +11,7 @@ import ( "syscall" "time" + "github.com/containers/podman/v3/pkg/cgroups" . "github.com/containers/podman/v3/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/mrunalp/fileutils" @@ -1323,13 +1324,19 @@ USER mail`, BB) }) It("podman run with cgroups=disabled runs without cgroups", func() { - SkipIfRootless("FIXME: I believe this should work but need to fix this test") SkipIfRootlessCgroupsV1("Disable cgroups not supported on cgroupv1 for rootless users") // Only works on crun if !strings.Contains(podmanTest.OCIRuntime, "crun") { Skip("Test only works on crun") } + ownsCgroup, err := cgroups.UserOwnsCurrentSystemdCgroup() + Expect(err).ShouldNot(HaveOccurred()) + if !ownsCgroup { + // Podman moves itself to a new cgroup if it doesn't own the current cgroup + Skip("Test only works when Podman owns the current cgroup") + } + trim := func(i string) string { return strings.TrimSuffix(i, "\n") } |