Merge pull request #7848 from cevich/fix_tests

Fix two e2e tests

1 files changed, 24 insertions, 11 deletions

diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index f4c80d865..c663a4dca 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -599,19 +599,21 @@ func (p *PodmanTestIntegration) CreateSeccompJson(in []byte) (string, error) {
 	return jsonFile, nil
 }
 
-func SkipIfRootlessCgroupsV1(reason string) {
+func checkReason(reason string) {
 	if len(reason) < 5 {
-		panic("SkipIfRootlessCgroupsV1 must specify a reason to skip")
+		panic("Test must specify a reason to skip")
 	}
+}
+
+func SkipIfRootlessCgroupsV1(reason string) {
+	checkReason(reason)
 	if os.Geteuid() != 0 && !CGROUPSV2 {
 		Skip("[rootless]: " + reason)
 	}
 }
 
 func SkipIfRootless(reason string) {
-	if len(reason) < 5 {
-		panic("SkipIfRootless must specify a reason to skip")
-	}
+	checkReason(reason)
 	if os.Geteuid() != 0 {
 		ginkgo.Skip("[rootless]: " + reason)
 	}
@@ -629,23 +631,34 @@ func isRootless() bool {
 }
 
 func SkipIfCgroupV1(reason string) {
-	if len(reason) < 5 {
-		panic("SkipIfCgroupV1 must specify a reason to skip")
-	}
+	checkReason(reason)
 	if !CGROUPSV2 {
 		Skip(reason)
 	}
 }
 
 func SkipIfCgroupV2(reason string) {
-	if len(reason) < 5 {
-		panic("SkipIfCgroupV2 must specify a reason to skip")
-	}
+	checkReason(reason)
 	if CGROUPSV2 {
 		Skip(reason)
 	}
 }
 
+func isContainerized() bool {
+	// This is set to "podman" by podman automatically
+	if os.Getenv("container") != "" {
+		return true
+	}
+	return false
+}
+
+func SkipIfContainerized(reason string) {
+	checkReason(reason)
+	if isContainerized() {
+		Skip(reason)
+	}
+}
+
 // PodmanAsUser is the exec call to podman on the filesystem with the specified uid/gid and environment
 func (p *PodmanTestIntegration) PodmanAsUser(args []string, uid, gid uint32, cwd string, env []string) *PodmanSessionIntegration {
 	podmanSession := p.PodmanAsUserBase(args, uid, gid, cwd, env, false, false, nil)