diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-01-15 06:37:44 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-01-15 09:24:28 -0500 |
| commit | 7a30e82220bec030418a0999d0d4d064a70670ec (patch) | |
| tree | 767174413d6a9cea61b5be8cd0bf6129f0be27bb | |
| parent | 3fcf346890c0437611fc18c30d58cc2d9f61fe6c (diff) | |
| download | podman-7a30e82220bec030418a0999d0d4d064a70670ec.tar.gz podman-7a30e82220bec030418a0999d0d4d064a70670ec.tar.bz2 podman-7a30e82220bec030418a0999d0d4d064a70670ec.zip | |
Turn on podman pod stats test for rootless cgroup v2
These tests should only be blocked for cgroups V1
Fixes: https://github.com/containers/podman/issues/8734
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | test/e2e/pod_stats_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 287830102..1709b4f81 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -17,7 +17,7 @@ var _ = Describe("Podman pod stats", func() { ) BeforeEach(func() { - SkipIfRootless("Tests fail with both CGv1/2 + required --cgroup-manager=cgroupfs") + SkipIfRootlessCgroupsV1("Tests fail with both CGv1 + required --cgroup-manager=cgroupfs") if isContainerized() { SkipIfCgroupV1("All tests fail Error: unable to load cgroup at ...: cgroup deleted") } @@ -176,8 +176,7 @@ var _ = Describe("Podman pod stats", func() { }) It("podman stats on net=host post", func() { - // --net=host not supported for rootless pods at present - SkipIfRootlessCgroupsV1("Pause stats not supported in cgroups v1") + SkipIfRootless("--net=host not supported for rootless pods at present") podName := "testPod" podCreate := podmanTest.Podman([]string{"pod", "create", "--net=host", "--name", podName}) podCreate.WaitWithDefaultTimeout() |