containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8983 from rhatdan/test 

Turn on podman pod stats test for rootless cgroup v2
This commit is contained in:
OpenShift Merge Robot 2021-01-15 11:47:48 -05:00 committed by GitHub
parent 7d3a628c6b 7a30e82220
commit 0400dc0a00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/pod_stats_test.go
View File

@ -17,7 +17,7 @@ var _ = Describe("Podman pod stats", func() {
) )
BeforeEach(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() { if isContainerized() {
SkipIfCgroupV1("All tests fail Error: unable to load cgroup at ...: cgroup deleted") 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() { It("podman stats on net=host post", func() {
// --net=host not supported for rootless pods at present SkipIfRootless("--net=host not supported for rootless pods at present")
SkipIfRootlessCgroupsV1("Pause stats not supported in cgroups v1")
podName := "testPod" podName := "testPod"
podCreate := podmanTest.Podman([]string{"pod", "create", "--net=host", "--name", podName}) podCreate := podmanTest.Podman([]string{"pod", "create", "--net=host", "--name", podName})
podCreate.WaitWithDefaultTimeout() podCreate.WaitWithDefaultTimeout()