use it.Pend instead of return to skip tests not working with root

Co-authored-by: Philipp Stehle <[email protected]>
paketo-buildpacks · Jan 10, 2024 · d0507d6 · d0507d6
1 parent f25b563
commit d0507d6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 27 deletions.
diff --git a/certificate_loader_test.go b/certificate_loader_test.go
@@ -155,11 +155,7 @@ func testCertificateLoader(t *testing.T, context spec.G, it spec.S) {
 			Expect(ks).To(HaveLen(3))
 		})
 
-		if internal.IsRoot() {
-			return
-		}
-
-		it("does not return error when keystore is read-only", func() {
+		internal.SkipIfRoot(it, "does not return error when keystore is read-only", func() {
 			Expect(os.Chmod(path, 0555)).To(Succeed())
 
 			c := libjvm.CertificateLoader{
@@ -256,11 +252,7 @@ func testCertificateLoader(t *testing.T, context spec.G, it spec.S) {
 			Expect(ks.Aliases()).To(HaveLen(3))
 		})
 
-		if internal.IsRoot() {
-			return
-		}
-
-		it("does not return error when keystore is read-only", func() {
+		internal.SkipIfRoot(it, "does not return error when keystore is read-only", func() {
 			Expect(os.Chmod(path, 0555)).To(Succeed())
 
 			c := libjvm.CertificateLoader{

diff --git a/helper/link_local_dns_test.go b/helper/link_local_dns_test.go
@@ -90,11 +90,7 @@ networkaddress.cache.negative.ttl=0
 `)))
 		})
 
-		if internal.IsRoot() {
-			return
-		}
-
-		it("warns if file is read-only", func() {
+		internal.SkipIfRoot(it, "warns if file is read-only", func() {
 			Expect(os.Chmod(path, 0555)).To(Succeed())
 
 			config := &ddns.ClientConfig{Servers: []string{"169.254.0.1"}}

diff --git a/helper/openssl_certificate_loader_test.go b/helper/openssl_certificate_loader_test.go
@@ -98,11 +98,7 @@ func testOpenSSLCertificateLoader(t *testing.T, context spec.G, it spec.S) {
 			Expect(ks.Aliases()).To(HaveLen(3))
 		})
 
-		if internal.IsRoot() {
-			return
-		}
-
-		it("does use temp keystore if keystore is read-only", func() {
+		internal.SkipIfRoot(it, "does use temp keystore if keystore is read-only", func() {
 			Expect(os.Chmod(path, 0555)).To(Succeed())
 
 			o := helper.OpenSSLCertificateLoader{CertificateLoader: cl, Logger: bard.NewLogger(ioutil.Discard)}
@@ -122,7 +118,7 @@ func testOpenSSLCertificateLoader(t *testing.T, context spec.G, it spec.S) {
 			Expect(env).To(HaveKeyWithValue("JAVA_TOOL_OPTIONS", fmt.Sprintf("-Djavax.net.ssl.trustStore=%s", helper.TmpTrustStore)))
 		})
 
-		it("does not return error when keystore and /tmp/truststore are read-only", func() {
+		internal.SkipIfRoot(it, "does not return error when keystore and /tmp/truststore are read-only", func() {
 			Expect(os.Chmod(path, 0555)).To(Succeed())
 			_, err := os.OpenFile(helper.TmpTrustStore, os.O_CREATE, 0)
 			Expect(err).NotTo(HaveOccurred())

diff --git a/helper/security_providers_configurer_test.go b/helper/security_providers_configurer_test.go
@@ -106,11 +106,7 @@ security.provider.6=FOXTROT
 `)))
 				})
 
-				if internal.IsRoot() {
-					return
-				}
-
-				it("warns if the file is read-only", func() {
+				internal.SkipIfRoot(it, "warns if the file is read-only", func() {
 					Expect(os.Chmod(path, 0555)).To(Succeed())
 
 					Expect(helper.SecurityProvidersConfigurer{}.Execute()).To(BeNil())

diff --git a/internal/if_not_root.go b/internal/if_not_root.go
@@ -18,9 +18,18 @@ package internal
 
 import (
 	"os/user"
+
+	"github.com/sclevine/spec"
 )
 
-func IsRoot() bool {
+func isRoot() bool {
 	u, _ := user.Current()
 	return u.Username == "root"
 }
+
+func SkipIfRoot(it spec.S, text string, f func(), options ...spec.Option) {
+	if isRoot() {
+		it = it.Pend
+	}
+	it(text, f, options...)
+}