summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-15 11:47:48 -0500
committerGitHub <noreply@github.com>2021-01-15 11:47:48 -0500
commit0400dc0a0017a8347e47b32c411e65531b0f4af4 (patch)
tree68387dd074630cb70356c950e3cde29a9e388bd4
parent7d3a628c6ba79efa4b0daaff904b6c2b157dcfc5 (diff)
parent7a30e82220bec030418a0999d0d4d064a70670ec (diff)
downloadpodman-0400dc0a0017a8347e47b32c411e65531b0f4af4.tar.gz
podman-0400dc0a0017a8347e47b32c411e65531b0f4af4.tar.bz2
podman-0400dc0a0017a8347e47b32c411e65531b0f4af4.zip
Merge pull request #8983 from rhatdan/test
Turn on podman pod stats test for rootless cgroup v2
-rw-r--r--test/e2e/pod_stats_test.go5
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()