Skip to content

Commit

Permalink
Merge pull request #8983 from rhatdan/test
Browse files Browse the repository at this point in the history
Turn on podman pod stats test for rootless cgroup v2
  • Loading branch information
openshift-merge-robot authored Jan 15, 2021
2 parents 7d3a628 + 7a30e82 commit 0400dc0
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 0400dc0

Please sign in to comment.