diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-09 19:59:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 19:59:58 +0200 |
| commit | d9cd0032f7478e625329326d7593162a9f1e8c1e (patch) | |
| tree | 7479f96d73dae9dc186bffbb3cb203a3f1ae7558 /test/e2e/pod_stats_test.go | |
| parent | 059bd37511e917f860e784307ee1f2766d8d4ec3 (diff) | |
| parent | b020d1ad13267bd71065457f83116af39c77f7e5 (diff) | |
| download | podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.tar.gz podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.tar.bz2 podman-d9cd0032f7478e625329326d7593162a9f1e8c1e.zip | |
Merge pull request #6906 from rhatdan/VENDOR
Vendor in new version of Buildah
Diffstat (limited to 'test/e2e/pod_stats_test.go')
| -rw-r--r-- | test/e2e/pod_stats_test.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 6cf392bd7..74d1c1838 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -5,7 +5,6 @@ package integration import ( "os" - "github.com/containers/libpod/v2/pkg/cgroups" . "github.com/containers/libpod/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -13,16 +12,14 @@ import ( var _ = Describe("Podman pod stats", func() { var ( + err error tempdir string podmanTest *PodmanTestIntegration ) BeforeEach(func() { - cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() - Expect(err).To(BeNil()) - - if os.Geteuid() != 0 && !cgroupsv2 { - Skip("This function is not enabled for rootless podman not running on cgroups v2") + if os.Geteuid() != 0 { + SkipIfCgroupV2() } tempdir, err = CreateTempDirInTempDir() |