diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-05 07:35:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 07:35:29 -0800 |
| commit | 4fb724c72e49768ed31d2dc85a7ad579f8d5c872 (patch) | |
| tree | 86bfbf8435a9eb5fd523363957809a6902b83af1 /test | |
| parent | ae839dad5add84b5b6ffd4260987d08441196986 (diff) | |
| parent | 077ee1a10dafcebe8149f674eee10748a2114336 (diff) | |
| download | podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.tar.gz podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.tar.bz2 podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.zip | |
Merge pull request #4639 from giuseppe/fix-stats-pod
libpod: fix stats for rootless pods
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/pod_stats_test.go | 10 | ||||
| -rw-r--r-- | test/e2e/stats_test.go | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 4d573a2c7..347f33e62 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -5,6 +5,7 @@ package integration import ( "os" + "github.com/containers/libpod/pkg/cgroups" . "github.com/containers/libpod/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -13,12 +14,17 @@ import ( var _ = Describe("Podman pod stats", func() { var ( tempdir string - err error podmanTest *PodmanTestIntegration ) BeforeEach(func() { - SkipIfRootless() + 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") + } + tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index fbf7c9920..762417a17 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -6,6 +6,7 @@ import ( "fmt" "os" + "github.com/containers/libpod/pkg/cgroups" . "github.com/containers/libpod/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -16,12 +17,16 @@ import ( var _ = Describe("Podman stats", func() { var ( tempdir string - err error podmanTest *PodmanTestIntegration ) BeforeEach(func() { - SkipIfRootless() + 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") + } tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) |