From 0bb865e6c24942afec3757abd7ea6375be182190 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 10 Dec 2020 14:07:46 -0500 Subject: Disable rootless pod stats tests w/ CgroupV1 When running as rootless, on a CgroupV1 host these tests all report: `Error: pod stats is not supported in rootless mode without cgroups v2` Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich --- test/e2e/pod_stats_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'test') diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 9af410fcc..a034ec2d1 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -17,9 +17,7 @@ var _ = Describe("Podman pod stats", func() { ) BeforeEach(func() { - if os.Geteuid() != 0 { - SkipIfCgroupV2("--cgroup-manager=cgroupfs which doesn't work in rootless mode") - } + SkipIfRootless("Tests fail with both CGv1/2 + required --cgroup-manager=cgroupfs") if isContainerized() { SkipIfCgroupV1("All tests fail Error: unable to load cgroup at ...: cgroup deleted") } -- cgit v1.2.3-54-g00ecf