Merge pull request #16492 from spowelljr/addSetupSubtest

testing: added Setup subtest for ImageBuild

Author: medyagh

site/content/en/docs/contrib/tests.en.md

@@ -449,6 +449,9 @@ tests the functionality of the gVisor addon
 ## TestImageBuild
 makes sure the 'minikube image build' command works fine
 
+#### validateSetupImageBuild
+starts a cluster for the image builds
+
 #### validateNormalImageBuild
 is normal test case for minikube image build, with -t parameter
 

test/integration/image_test.go

@@ -35,20 +35,15 @@ func TestImageBuild(t *testing.T) {
 	type validateFunc func(context.Context, *testing.T, string)
 	profile := UniqueProfileName("image")
 	ctx, cancel := context.WithTimeout(context.Background(), Minutes(15))
-	startArgs := []string{"start", "-p", profile}
-	startArgs = append(startArgs, StartArgs()...)
-	rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
 	defer Cleanup(t, profile, cancel)
-	if err != nil {
-		t.Fatalf("failed to start minikube with args: %q : %v", rr.Command(), err)
-	}
 
 	// Serial tests
 	t.Run("serial", func(t *testing.T) {
 		tests := []struct {
 			name      string
 			validator validateFunc
 		}{
+			{"Setup", validateSetupImageBuild},
 			{"NormalBuild", validateNormalImageBuild},
 			{"BuildWithBuildArg", validateImageBuildWithBuildArg},
 			{"BuildWithDockerIgnore", validateImageBuildWithDockerIgnore},
@@ -58,14 +53,24 @@ func TestImageBuild(t *testing.T) {
 		for _, tc := range tests {
 			t.Run(tc.name, func(t *testing.T) {
 				tc.validator(ctx, t, profile)
-				if t.Failed() && *postMortemLogs {
-					PostMortemLogs(t, profile)
-				}
 			})
+			// if setup fails bail
+			if tc.name == "Setup" && t.Failed() {
+				return
+			}
 		}
 	})
 }
 
+// validateSetupImageBuild starts a cluster for the image builds
+func validateSetupImageBuild(ctx context.Context, t *testing.T, profile string) {
+	defer PostMortemLogs(t, profile)
+	startArgs := append([]string{"start", "-p", profile}, StartArgs()...)
+	if rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...)); err != nil {
+		t.Fatalf("failed to start minikube with args: %q : %v", rr.Command(), err)
+	}
+}
+
 // validateNormalImageBuild is normal test case for minikube image build, with -t parameter
 func validateNormalImageBuild(ctx context.Context, t *testing.T, profile string) {
 	defer PostMortemLogs(t, profile)