Skip to content

Commit

Permalink
Turn on podman pod stats test for rootless cgroup v2
Browse files Browse the repository at this point in the history
These tests should only be blocked for cgroups V1

Fixes: #8734
Signed-off-by: Daniel J Walsh <[email protected]>
  • Loading branch information
rhatdan committed Jan 15, 2021
1 parent 3fcf346 commit 7a30e82
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions test/e2e/pod_stats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 7a30e82

Please sign in to comment.