diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 08:42:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-22 08:42:27 -0400 |
commit | 558809d4bbd735eca2a31bb07249ac42850f37de (patch) | |
tree | 41ffa2cf2c65ac490e5a4e6a6af1616b32e49cf5 /test/e2e/common_test.go | |
parent | ef03815117fdf1b8b43d4e2b18caa00ddb3a82b6 (diff) | |
parent | 65e1638f9bba1bd16dfcef5bb897cf1c1bc4889f (diff) | |
download | podman-558809d4bbd735eca2a31bb07249ac42850f37de.tar.gz podman-558809d4bbd735eca2a31bb07249ac42850f37de.tar.bz2 podman-558809d4bbd735eca2a31bb07249ac42850f37de.zip |
Merge pull request #7044 from rhatdan/remotetest
Enable a bunch of remote tests
Diffstat (limited to 'test/e2e/common_test.go')
-rw-r--r-- | test/e2e/common_test.go | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index aa0e9635a..f475a927c 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -14,6 +14,7 @@ import ( "time" "github.com/containers/libpod/v2/libpod/define" + "github.com/containers/libpod/v2/pkg/cgroups" "github.com/containers/libpod/v2/pkg/inspect" "github.com/containers/libpod/v2/pkg/rootless" . "github.com/containers/libpod/v2/test/utils" @@ -599,3 +600,21 @@ func SkipIfNotFedora() { func isRootless() bool { return os.Geteuid() != 0 } + +func SkipIfCgroupV1() { + cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() + Expect(err).To(BeNil()) + + if !cgroupsv2 { + Skip("Skip on systems with cgroup V1 systems") + } +} + +func SkipIfCgroupV2() { + cgroupsv2, err := cgroups.IsCgroup2UnifiedMode() + Expect(err).To(BeNil()) + + if cgroupsv2 { + Skip("Skip on systems with cgroup V2 systems") + } +} |