skip instead of failing if test vars aren't set

concourse · Nov 13, 2018 · 70e97f8 · 70e97f8
1 parent 0cc81e7
commit 70e97f8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/check/check_suite_test.go b/check/check_suite_test.go
@@ -19,12 +19,6 @@ var v2signing = os.Getenv("SEMVER_TESTING_V2_SIGNING") == "true"
 
 var _ = BeforeSuite(func() {
 	var err error
-
-	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
-	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
-	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
-	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
-
 	if _, err = os.Stat("/opt/resource/check"); err == nil {
 		checkPath = "/opt/resource/check"
 	} else {
@@ -33,6 +27,17 @@ var _ = BeforeSuite(func() {
 	}
 })
 
+var _ = BeforeEach(func() {
+	if accessKeyID == "" || secretAccessKey == "" {
+		Skip("no bucket configuration; skipping")
+	}
+
+	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
+	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
+	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
+	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
+})
+
 var _ = AfterSuite(func() {
 	gexec.CleanupBuildArtifacts()
 })

diff --git a/in/in_suite_test.go b/in/in_suite_test.go
@@ -20,11 +20,6 @@ var v2signing = os.Getenv("SEMVER_TESTING_V2_SIGNING") == "true"
 var _ = BeforeSuite(func() {
 	var err error
 
-	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
-	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
-	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
-	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
-
 	if _, err = os.Stat("/opt/resource/in"); err == nil {
 		inPath = "/opt/resource/in"
 	} else {
@@ -34,6 +29,14 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = BeforeEach(func() {
+	if accessKeyID == "" || secretAccessKey == "" {
+		Skip("no bucket configuration; skipping")
+	}
+
+	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
+	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
+	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
+	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
 })
 
 var _ = AfterSuite(func() {

diff --git a/out/out_suite_test.go b/out/out_suite_test.go
@@ -20,11 +20,6 @@ var v2signing = os.Getenv("SEMVER_TESTING_V2_SIGNING") == "true"
 var _ = BeforeSuite(func() {
 	var err error
 
-	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
-	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
-	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
-	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
-
 	if _, err = os.Stat("/opt/resource/out"); err == nil {
 		outPath = "/opt/resource/out"
 	} else {
@@ -33,6 +28,17 @@ var _ = BeforeSuite(func() {
 	}
 })
 
+var _ = BeforeEach(func() {
+	if accessKeyID == "" || secretAccessKey == "" {
+		Skip("no bucket configuration; skipping")
+	}
+
+	Expect(accessKeyID).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_ACCESS_KEY_ID")
+	Expect(secretAccessKey).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_SECRET_ACCESS_KEY")
+	Expect(bucketName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_BUCKET")
+	Expect(regionName).NotTo(BeEmpty(), "must specify $SEMVER_TESTING_REGION")
+})
+
 var _ = AfterSuite(func() {
 	gexec.CleanupBuildArtifacts()
 })