diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-28 09:17:27 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-29 16:01:26 -0400 |
| commit | b496802413aecf95b0d2786cb6e13618b388a406 (patch) | |
| tree | 1d48d952e8dff642ab5db1edbc9d30a4da4fbef5 /test/e2e/run_cpu_test.go | |
| parent | 453333a35cc791e9031e5d24e0ac5e76a2b2aa75 (diff) | |
| download | podman-b496802413aecf95b0d2786cb6e13618b388a406.tar.gz podman-b496802413aecf95b0d2786cb6e13618b388a406.tar.bz2 podman-b496802413aecf95b0d2786cb6e13618b388a406.zip | |
Make all Skips specify a reason
Always use CGROUPV2 rather then reading from system all the time.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e/run_cpu_test.go')
| -rw-r--r-- | test/e2e/run_cpu_test.go | 8 |
1 files changed, 2 insertions, 6 deletions
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") } |