From b496802413aecf95b0d2786cb6e13618b388a406 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 28 Sep 2020 09:17:27 -0400 Subject: Make all Skips specify a reason Always use CGROUPV2 rather then reading from system all the time. Signed-off-by: Daniel J Walsh --- test/e2e/run_cpu_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'test/e2e/run_cpu_test.go') diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index 86cc9d1c5..d8b57c230 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -4,7 +4,6 @@ import ( "io/ioutil" "os" - "github.com/containers/podman/v2/pkg/cgroups" . "github.com/containers/podman/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -18,17 +17,14 @@ var _ = Describe("Podman run cpu", func() { ) BeforeEach(func() { - SkipIfRootlessCgroupsV1() + SkipIfRootlessCgroupsV1("Setting CPU not supported on cgroupv1 for rootless users") tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) } - cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() - Expect(err).To(BeNil()) - - if cgroupsv2 { + if CGROUPSV2 { if err := ioutil.WriteFile("/sys/fs/cgroup/cgroup.subtree_control", []byte("+cpuset"), 0644); err != nil { Skip("cpuset controller not available on the current kernel") } -- cgit v1.2.3-54-g00ecf