From b496802413aecf95b0d2786cb6e13618b388a406 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 28 Sep 2020 09:17:27 -0400 Subject: Make all Skips specify a reason Always use CGROUPV2 rather then reading from system all the time. Signed-off-by: Daniel J Walsh --- test/e2e/libpod_suite_test.go | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'test/e2e/libpod_suite_test.go') diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 00d066fea..a9da922de 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -8,8 +8,6 @@ import ( "os" "path/filepath" "strings" - - . "github.com/onsi/ginkgo" ) func IsRemote() bool { @@ -19,18 +17,6 @@ func IsRemote() bool { func SkipIfRemote(string) { } -func SkipIfRootlessCgroupsV1() { - if os.Geteuid() != 0 && !CGROUPSV2 { - Skip("Rooless requires cgroupsV2 to set limits") - } -} - -func SkipIfRootless() { - if os.Geteuid() != 0 { - Skip("This function is not enabled for rootless podman") - } -} - // Podman is the exec call to podman on the filesystem func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration { podmanSession := p.PodmanBase(args, false, false) -- cgit v1.2.3-54-g00ecf