Merge pull request GoogleContainerTools#3358 from dgageot/simplify-in…

…t-tests Simplify handling of GCP only tests
ktarplee · Dec 11, 2019 · a995415 · a995415
2 parents f454cb5 + 0e24424
commit a995415
Show file tree

Hide file tree

Showing 17 changed files with 144 additions and 247 deletions.
diff --git a/integration/build_test.go b/integration/build_test.go
@@ -45,11 +45,8 @@ import (
 const imageName = "simple-build:"
 
 func TestBuild(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	tests := []struct {
@@ -136,11 +133,8 @@ func TestBuild(t *testing.T) {
 
 //see integration/testdata/README.md for details
 func TestBuildInCluster(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is gcp only")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	testutil.Run(t, "", func(t *testutil.T) {
@@ -317,11 +311,8 @@ func failNowIfError(t *testing.T, err error) {
 
 // TestExpectedBuildFailures verifies that `skaffold build` fails in expected ways
 func TestExpectedBuildFailures(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	tests := []struct {
@@ -350,14 +341,10 @@ func TestExpectedBuildFailures(t *testing.T) {
 	}
 }
 
+// run on GCP as this test requires a load balancer
 func TestBuildKanikoInsecureRegistry(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-
-	// run on GCP as this test requires a load balancer
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is gcp only")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	ns, k8sClient, cleanupNs := SetupNamespace(t)
@@ -397,11 +384,8 @@ func getExternalIP(t *testing.T, c *NSKubernetesClient, ns string) string {
 }
 
 func TestBuildGCBWithDefaultRepo(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is gcp only")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	// The GCB project (k8s-skaffold) has to be deduced from artifact's image name
@@ -411,11 +395,8 @@ func TestBuildGCBWithDefaultRepo(t *testing.T) {
 }
 
 func TestBuildKanikoWithDefaultRepo(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is gcp only")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	// The GCS project (k8s-skaffold) has to be deduced from artifact's image name

diff --git a/integration/cache_test.go b/integration/cache_test.go
@@ -28,11 +28,8 @@ import (
 )
 
 func TestCacheAPITriggers(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	// Run skaffold build first to cache artifacts.

diff --git a/integration/config_test.go b/integration/config_test.go
@@ -24,11 +24,8 @@ import (
 )
 
 func TestConfigListForContext(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	out := skaffold.Config("list", "-c", "testdata/config/config.yaml", "-k", "test-context").RunOrFailOutput(t)
@@ -37,11 +34,8 @@ func TestConfigListForContext(t *testing.T) {
 }
 
 func TestConfigListForAll(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	out := skaffold.Config("list", "-c", "testdata/config/config.yaml", "--all").RunOrFailOutput(t)
@@ -57,11 +51,8 @@ func TestConfigListForAll(t *testing.T) {
 }
 
 func TestFailToSetUnrecognizedValue(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	err := skaffold.Config("set", "doubt-this-will-ever-be-a-config-key", "VALUE", "-c", "testdata/config/config.yaml", "--global").Run(t)
@@ -70,11 +61,8 @@ func TestFailToSetUnrecognizedValue(t *testing.T) {
 }
 
 func TestSetDefaultRepoForContext(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	file, delete := testutil.TempFile(t, "config", nil)
@@ -87,11 +75,8 @@ func TestSetDefaultRepoForContext(t *testing.T) {
 }
 
 func TestSetGlobalDefaultRepo(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	file, delete := testutil.TempFile(t, "config", nil)

diff --git a/integration/debug_test.go b/integration/debug_test.go
@@ -23,11 +23,8 @@ import (
 )
 
 func TestDebug(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	tests := []struct {

diff --git a/integration/deploy_test.go b/integration/deploy_test.go
@@ -28,11 +28,8 @@ import (
 )
 
 func TestBuildDeploy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	ns, client, deleteNs := SetupNamespace(t)
@@ -83,11 +80,8 @@ func TestBuildDeploy(t *testing.T) {
 }
 
 func TestDeploy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	ns, client, deleteNs := SetupNamespace(t)
@@ -102,11 +96,8 @@ func TestDeploy(t *testing.T) {
 }
 
 func TestDeployTail(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	ns, _, deleteNs := SetupNamespace(t)
@@ -139,11 +130,8 @@ func TestDeployTail(t *testing.T) {
 }
 
 func TestDeployWithInCorrectConfig(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	ns, _, deleteNs := SetupNamespace(t)

diff --git a/integration/dev_test.go b/integration/dev_test.go
@@ -36,6 +36,10 @@ import (
 )
 
 func TestDev(t *testing.T) {
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
+	}
+
 	tests := []struct {
 		description string
 		trigger     string
@@ -51,13 +55,6 @@ func TestDev(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
-			if testing.Short() {
-				t.Skip("skipping integration test")
-			}
-			if ShouldRunGCPOnlyTests() {
-				t.Skip("skipping test that is not gcp only")
-			}
-
 			Run(t, "testdata/dev", "sh", "-c", "echo foo > foo")
 			defer Run(t, "testdata/dev", "rm", "foo")
 
@@ -86,11 +83,8 @@ func TestDev(t *testing.T) {
 }
 
 func TestDevAPITriggers(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	Run(t, "testdata/dev", "sh", "-c", "echo foo > foo")
@@ -173,11 +167,8 @@ func TestDevAPITriggers(t *testing.T) {
 }
 
 func TestDevPortForward(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	// Run skaffold build first to fail quickly on a build failure
@@ -231,11 +222,8 @@ func TestDevPortForward(t *testing.T) {
 }
 
 func TestDevPortForwardGKELoadBalancer(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is gcp only")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	// Run skaffold build first to fail quickly on a build failure
@@ -369,11 +357,11 @@ func readEventAPIStream(client proto.SkaffoldServiceClient, t *testing.T, retrie
 }
 
 func TestDev_WithKubecontextOverride(t *testing.T) {
-	testutil.Run(t, "skaffold run with kubecontext override", func(t *testutil.T) {
-		if testing.Short() {
-			t.Skip("skipping integration test")
-		}
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
+	}
 
+	testutil.Run(t, "skaffold run with kubecontext override", func(t *testutil.T) {
 		dir := "examples/getting-started"
 		pods := []string{"getting-started"}
 

diff --git a/integration/diagnose_test.go b/integration/diagnose_test.go
@@ -26,11 +26,8 @@ import (
 )
 
 func TestDiagnose(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	examples, err := folders("examples")

diff --git a/integration/fix_test.go b/integration/fix_test.go
@@ -23,11 +23,8 @@ import (
 )
 
 func TestFix(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	ns, _, deleteNs := SetupNamespace(t)

diff --git a/integration/generate_pipeline_test.go b/integration/generate_pipeline_test.go
@@ -31,11 +31,8 @@ type configContents struct {
 }
 
 func TestGeneratePipeline(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if ShouldRunGCPOnlyTests() {
-		t.Skip("skipping test that is not gcp only")
+	if testing.Short() || RunOnGCP() {
+		t.Skip("skipping kind integration test")
 	}
 
 	tests := []struct {
@@ -74,7 +71,6 @@ func TestGeneratePipeline(t *testing.T) {
 			skipCheck:   true,
 		},
 	}
-
 	for _, test := range tests {
 		t.Run(test.description, func(t *testing.T) {
 			args, contents, err := getOriginalContents(test.args, test.dir, test.configFiles)

diff --git a/integration/helm_test.go b/integration/helm_test.go
@@ -30,11 +30,8 @@ const (
 )
 
 func TestHelmDeploy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test")
-	}
-	if !ShouldRunGCPOnlyTests() {
-		t.Skip("skipping gcp only test")
+	if testing.Short() || !RunOnGCP() {
+		t.Skip("skipping GCP integration test")
 	}
 
 	helmDir := "testdata/helm"