Support suppressing tests that require a custom docker image to pass

ccushing · codycushing · commit f34e083ce66b · 2019-01-23T19:21:32.000-08:00
diff --git a/oci/examples_test.go b/oci/examples_test.go
@@ -53,14 +53,23 @@ var examplesTestAllowedEnvironmentVariables = []string{
 }
 
 func TestExamplesPlan(t *testing.T) {
+	if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestExamplesPlan") {
+		t.Skip("Skipping TestExamplesPlan")
+	}
 	RunExamples(t, true)
 }
 
 func TestExamplesApply(t *testing.T) {
+	if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestExamplesApply") {
+		t.Skip("Skipping TestExamplesApply")
+	}
 	RunExamples(t, false)
 }
 
 func TestTerraformVersions(t *testing.T) {
+	if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestTerraformVersions") {
+		t.Skip("Skipping TestTerraformVersions")
+	}
 	if RunConfigOnAllTerraformVersions(t, vcnExamplePath, false) {
 		log.Printf("Successfully ran all Terraform version tests")
 	}

Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,23 @@ var examplesTestAllowedEnvironmentVariables = []string{`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func TestExamplesPlan(t *testing.T) {`
	`56`	`+ if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestExamplesPlan") {`
	`57`	`+ t.Skip("Skipping TestExamplesPlan")`
	`58`	`+ }`
`56`	`59`	`RunExamples(t, true)`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`func TestExamplesApply(t *testing.T) {`
	`63`	`+ if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestExamplesApply") {`
	`64`	`+ t.Skip("Skipping TestExamplesApply")`
	`65`	`+ }`
`60`	`66`	`RunExamples(t, false)`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`func TestTerraformVersions(t *testing.T) {`
	`70`	`+ if strings.Contains(getEnvSettingWithBlankDefault("suppressed_tests"), "TestTerraformVersions") {`
	`71`	`+ t.Skip("Skipping TestTerraformVersions")`
	`72`	`+ }`
`64`	`73`	`if RunConfigOnAllTerraformVersions(t, vcnExamplePath, false) {`
`65`	`74`	`log.Printf("Successfully ran all Terraform version tests")`
`66`	`75`	`}`