diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-30 09:18:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 09:18:41 +0000 |
| commit | e9edddaaf2ab9d769d36adf00f97034db0a3cadf (patch) | |
| tree | 8d614f0a6a303c9f78605ca91fd04cf90b605d16 /test/e2e/pause_test.go | |
| parent | b68b6f334d4a83de35d68cc359365b348e72ad6b (diff) | |
| parent | b496802413aecf95b0d2786cb6e13618b388a406 (diff) | |
| download | podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.tar.gz podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.tar.bz2 podman-e9edddaaf2ab9d769d36adf00f97034db0a3cadf.zip | |
Merge pull request #7799 from rhatdan/rootless
Make all Skips specify a reason
Diffstat (limited to 'test/e2e/pause_test.go')
| -rw-r--r-- | test/e2e/pause_test.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index a49304bbe..a90ffcc87 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -7,7 +7,6 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v2/pkg/cgroups" . "github.com/containers/podman/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -24,16 +23,13 @@ var _ = Describe("Podman pause", func() { createdState := "created" BeforeEach(func() { - SkipIfRootlessCgroupsV1() // Pause is not supported in cgroups v1 + SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1") tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) } - cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() - Expect(err).To(BeNil()) - - if cgroupsv2 { + if CGROUPSV2 { b, err := ioutil.ReadFile("/proc/self/cgroup") if err != nil { Skip("cannot read self cgroup") |