tektoncd · tekton-robot · Sep 1, 2020 · Aug 25, 2020
diff --git a/pkg/reconciler/pipelinerun/pipelinerun_test.go b/pkg/reconciler/pipelinerun/pipelinerun_test.go
@@ -486,8 +486,6 @@ func TestReconcile_PipelineSpecTaskSpec(t *testing.T) {
 // TestReconcile_InvalidPipelineRuns runs "Reconcile" on several PipelineRuns that are invalid in different ways.
 // It verifies that reconcile fails, how it fails and which events are triggered.
 func TestReconcile_InvalidPipelineRuns(t *testing.T) {
-	// TestReconcile_InvalidPipelineRuns runs "Reconcile" on several PipelineRuns that are invalid in different ways.
-	// It verifies that reconcile fails, how it fails and which events are triggered.
 	ts := []*v1beta1.Task{
 		tb.Task("a-task-that-exists", tb.TaskNamespace("foo")),
 		tb.Task("a-task-that-needs-params", tb.TaskSpec(
@@ -518,184 +516,163 @@ func TestReconcile_InvalidPipelineRuns(t *testing.T) {
 			tb.PipelineTask("some-task", "a-task-that-needs-array-params"))),
 		tb.Pipeline("a-pipeline-with-missing-conditions", tb.PipelineNamespace("foo"), tb.PipelineSpec(tb.PipelineTask("some-task", "a-task-that-exists", tb.PipelineTaskCondition("condition-does-not-exist")))),
 	}
-	prs := []*v1beta1.PipelineRun{
-		tb.PipelineRun("invalid-pipeline", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("pipeline-not-exist")),
-		tb.PipelineRun("pipelinerun-missing-tasks", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("pipeline-missing-tasks")),
-		tb.PipelineRun("pipeline-params-dont-exist", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-without-params")),
-		tb.PipelineRun("pipeline-resources-not-bound", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-fine-pipeline")),
-		tb.PipelineRun("pipeline-resources-dont-exist", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-fine-pipeline",
+
+	for _, tc := range []struct {
+		name               string
+		pipelineRun        *v1beta1.PipelineRun
+		reason             string
+		hasNoDefaultLabels bool
+		permanentError     bool
+		wantEvents         []string
+	}{{
+		name:               "invalid-pipeline-shd-be-stop-reconciling",
+		pipelineRun:        tb.PipelineRun("invalid-pipeline", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("pipeline-not-exist")),
+		reason:             ReasonCouldntGetPipeline,
+		hasNoDefaultLabels: true,
+		permanentError:     true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed Error retrieving pipeline for pipelinerun",
+		},
+	}, {
+		name:           "invalid-pipeline-run-missing-tasks-shd-stop-reconciling",
+		pipelineRun:    tb.PipelineRun("pipelinerun-missing-tasks", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("pipeline-missing-tasks")),
+		reason:         ReasonCouldntGetTask,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed Pipeline foo/pipeline-missing-tasks can't be Run",
+		},
+	}, {
+		name:           "invalid-pipeline-run-params-dont-exist-shd-stop-reconciling",
+		pipelineRun:    tb.PipelineRun("pipeline-params-dont-exist", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-without-params")),
+		reason:         ReasonFailedValidation,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed invalid input params for task a-task-that-needs-params: missing values",
+		},
+	}, {
+		name:           "invalid-pipeline-run-resources-not-bound-shd-stop-reconciling",
+		pipelineRun:    tb.PipelineRun("pipeline-resources-not-bound", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-fine-pipeline")),
+		reason:         ReasonInvalidBindings,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/pipeline-resources-not-bound doesn't bind Pipeline",
+		},
+	}, {
+		name: "invalid-pipeline-run-missing-resource-shd-stop-reconciling",
+		pipelineRun: tb.PipelineRun("pipeline-resources-dont-exist", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-fine-pipeline",
 			tb.PipelineRunResourceBinding("a-resource", tb.PipelineResourceBindingRef("missing-resource")))),
-		tb.PipelineRun("pipeline-resources-not-declared", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-that-should-be-caught-by-admission-control")),
-		tb.PipelineRun("pipeline-mismatching-param-type", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-with-array-params", tb.PipelineRunParam("some-param", "stringval"))),
-		tb.PipelineRun("pipeline-conditions-missing", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-with-missing-conditions")),
-		tb.PipelineRun("embedded-pipeline-resources-not-bound", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonCouldntGetResource,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/pipeline-resources-dont-exist can't be Run; it tries to bind Resources",
+		},
+	}, {
+		name:           "invalid-pipeline-missing-declared-resource-shd-stop-reconciling",
+		pipelineRun:    tb.PipelineRun("pipeline-resources-not-declared", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-that-should-be-caught-by-admission-control")),
+		reason:         ReasonFailedValidation,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed Pipeline foo/a-pipeline-that-should-be-caught-by-admission-control can't be Run; it has an invalid spec",
+		},
+	}, {
+		name:           "invalid-pipeline-mismatching-parameter-types",
+		pipelineRun:    tb.PipelineRun("pipeline-mismatching-param-type", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-with-array-params", tb.PipelineRunParam("some-param", "stringval"))),
+		reason:         ReasonParameterTypeMismatch,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/pipeline-mismatching-param-type parameters have mismatching types",
+		},
+	}, {
+		name:           "invalid-pipeline-missing-conditions-shd-stop-reconciling",
+		pipelineRun:    tb.PipelineRun("pipeline-conditions-missing", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("a-pipeline-with-missing-conditions")),
+		reason:         ReasonCouldntGetCondition,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/pipeline-conditions-missing can't be Run; it contains Conditions",
+		},
+	}, {
+		name: "invalid-embedded-pipeline-resources-bot-bound-shd-stop-reconciling",
+		pipelineRun: tb.PipelineRun("embedded-pipeline-resources-not-bound", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineTask("some-task", "a-task-that-needs-a-resource"),
 			tb.PipelineDeclaredResource("workspace", "git"),
 		))),
-		tb.PipelineRun("embedded-pipeline-invalid", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonInvalidBindings,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/embedded-pipeline-resources-not-bound doesn't bind Pipeline",
+		},
+	}, {
+		name: "invalid-embedded-pipeline-bad-name-shd-stop-reconciling",
+		pipelineRun: tb.PipelineRun("embedded-pipeline-invalid", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineTask("bad-t@$k", "b@d-t@$k"),
 		))),
-		tb.PipelineRun("embedded-pipeline-mismatching-param-type", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonFailedValidation,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed Pipeline foo/embedded-pipeline-invalid can't be Run; it has an invalid spec",
+		},
+	}, {
+		name: "invalid-embedded-pipeline-mismatching-parameter-types",
+		pipelineRun: tb.PipelineRun("embedded-pipeline-mismatching-param-type", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineParamSpec("some-param", v1beta1.ParamTypeArray),
 			tb.PipelineTask("some-task", "a-task-that-needs-array-params")),
 			tb.PipelineRunParam("some-param", "stringval"),
 		)),
-		tb.PipelineRun("pipelinerun-missing-params", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonParameterTypeMismatch,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/embedded-pipeline-mismatching-param-type parameters have mismatching types",
+		},
+	}, {
+		name: "invalid-pipeline-run-missing-params-shd-stop-reconciling",
+		pipelineRun: tb.PipelineRun("pipelinerun-missing-params", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineParamSpec("some-param", v1beta1.ParamTypeString),
 			tb.PipelineTask("some-task", "a-task-that-needs-params")),
 		)),
-		tb.PipelineRun("pipeline-invalid-dag-graph", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonParameterMissing,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo parameters is missing some parameters required by Pipeline pipelinerun-missing-params",
+		},
+	}, {
+		name: "invalid-pipeline-with-invalid-dag-graph",
+		pipelineRun: tb.PipelineRun("pipeline-invalid-dag-graph", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineTask("dag-task-1", "dag-task-1", tb.RunAfter("dag-task-1")),
 		))),
-		tb.PipelineRun("pipeline-invalid-final-graph", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
+		reason:         ReasonInvalidGraph,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo/pipeline-invalid-dag-graph's Pipeline DAG is invalid",
+		},
+	}, {
+		name: "invalid-pipeline-with-invalid-final-tasks-graph",
+		pipelineRun: tb.PipelineRun("pipeline-invalid-final-graph", tb.PipelineRunNamespace("foo"), tb.PipelineRunSpec("", tb.PipelineRunPipelineSpec(
 			tb.PipelineTask("dag-task-1", "taskName"),
 			tb.FinalPipelineTask("final-task-1", "taskName"),
 			tb.FinalPipelineTask("final-task-1", "taskName")))),
-	}
-
-	tcs := []struct {
-		name               string
-		pipelineRun        *v1beta1.PipelineRun
-		reason             string
-		hasNoDefaultLabels bool
-		permanentError     bool
-		wantEvents         []string
-	}{
-		{
-			name:               "invalid-pipeline-shd-be-stop-reconciling",
-			pipelineRun:        prs[0],
-			reason:             ReasonCouldntGetPipeline,
-			hasNoDefaultLabels: true,
-			permanentError:     true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed Error retrieving pipeline for pipelinerun",
-			},
-		}, {
-			name:           "invalid-pipeline-run-missing-tasks-shd-stop-reconciling",
-			pipelineRun:    prs[1],
-			reason:         ReasonCouldntGetTask,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed Pipeline foo/pipeline-missing-tasks can't be Run",
-			},
-		}, {
-			name:           "invalid-pipeline-run-params-dont-exist-shd-stop-reconciling",
-			pipelineRun:    prs[2],
-			reason:         ReasonFailedValidation,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed invalid input params for task a-task-that-needs-params: missing values",
-			},
-		}, {
-			name:           "invalid-pipeline-run-resources-not-bound-shd-stop-reconciling",
-			pipelineRun:    prs[3],
-			reason:         ReasonInvalidBindings,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/pipeline-resources-not-bound doesn't bind Pipeline",
-			},
-		}, {
-			name:           "invalid-pipeline-run-missing-resource-shd-stop-reconciling",
-			pipelineRun:    prs[4],
-			reason:         ReasonCouldntGetResource,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/pipeline-resources-dont-exist can't be Run; it tries to bind Resources",
-			},
-		}, {
-			name:           "invalid-pipeline-missing-declared-resource-shd-stop-reconciling",
-			pipelineRun:    prs[5],
-			reason:         ReasonFailedValidation,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed Pipeline foo/a-pipeline-that-should-be-caught-by-admission-control can't be Run; it has an invalid spec",
-			},
-		}, {
-			name:           "invalid-pipeline-mismatching-parameter-types",
-			pipelineRun:    prs[6],
-			reason:         ReasonParameterTypeMismatch,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/pipeline-mismatching-param-type parameters have mismatching types",
-			},
-		}, {
-			name:           "invalid-pipeline-missing-conditions-shd-stop-reconciling",
-			pipelineRun:    prs[7],
-			reason:         ReasonCouldntGetCondition,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/pipeline-conditions-missing can't be Run; it contains Conditions",
-			},
-		}, {
-			name:           "invalid-embedded-pipeline-resources-bot-bound-shd-stop-reconciling",
-			pipelineRun:    prs[8],
-			reason:         ReasonInvalidBindings,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/embedded-pipeline-resources-not-bound doesn't bind Pipeline",
-			},
-		}, {
-			name:           "invalid-embedded-pipeline-bad-name-shd-stop-reconciling",
-			pipelineRun:    prs[9],
-			reason:         ReasonFailedValidation,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed Pipeline foo/embedded-pipeline-invalid can't be Run; it has an invalid spec",
-			},
-		}, {
-			name:           "invalid-embedded-pipeline-mismatching-parameter-types",
-			pipelineRun:    prs[10],
-			reason:         ReasonParameterTypeMismatch,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/embedded-pipeline-mismatching-param-type parameters have mismatching types",
-			},
-		}, {
-			name:           "invalid-pipeline-run-missing-params-shd-stop-reconciling",
-			pipelineRun:    prs[11],
-			reason:         ReasonParameterMissing,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo parameters is missing some parameters required by Pipeline pipelinerun-missing-params",
-			},
-		}, {
-			name:           "invalid-pipeline-with-invalid-dag-graph",
-			pipelineRun:    prs[12],
-			reason:         ReasonInvalidGraph,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo/pipeline-invalid-dag-graph's Pipeline DAG is invalid",
-			},
-		}, {
-			name:           "invalid-pipeline-with-invalid-final-tasks-graph",
-			pipelineRun:    prs[13],
-			reason:         ReasonInvalidGraph,
-			permanentError: true,
-			wantEvents: []string{
-				"Normal Started",
-				"Warning Failed PipelineRun foo's Pipeline DAG is invalid for finally clause",
-			},
+		reason:         ReasonInvalidGraph,
+		permanentError: true,
+		wantEvents: []string{
+			"Normal Started",
+			"Warning Failed PipelineRun foo's Pipeline DAG is invalid for finally clause",
 		},
-	}
-
-	for _, tc := range tcs {
+	}} {
 		t.Run(tc.name, func(t *testing.T) {
-
 			d := test.Data{
-				PipelineRuns: prs,
+				PipelineRuns: []*v1beta1.PipelineRun{tc.pipelineRun},
 				Pipelines:    ps,
 				Tasks:        ts,
 			}
@@ -1469,37 +1446,31 @@ func TestReconcileWithDifferentServiceAccounts(t *testing.T) {
 	}
 }
 
+// TestReconcileWithTimeoutAndRetry runs "Reconcile" against pipelines with
+// retries and timeout settings, and status that represents different number of
+// retries already performed.  It verifies the reconciled status and events
+// generated
 func TestReconcileWithTimeoutAndRetry(t *testing.T) {
-	// TestReconcileWithTimeoutAndRetry runs "Reconcile" against pipelines with retries and timeout settings,
-	// and status that represents different number of retries already performed.
-	// It verifies the reconciled status and events generated
-
-	tcs := []struct {
+	for _, tc := range []struct {
 		name               string
 		retries            int
 		conditionSucceeded corev1.ConditionStatus
 		wantEvents         []string
-	}{
-		{
-			name:               "One try has to be done",
-			retries:            1,
-			conditionSucceeded: corev1.ConditionFalse,
-			wantEvents: []string{
-				"Warning Failed PipelineRun \"test-pipeline-retry-run-with-timeout\" failed to finish within",
-			},
+	}{{
+		name:               "One try has to be done",
+		retries:            1,
+		conditionSucceeded: corev1.ConditionFalse,
+		wantEvents: []string{
+			"Warning Failed PipelineRun \"test-pipeline-retry-run-with-timeout\" failed to finish within",
 		},
-		{
-			name:               "No more retries are needed",
-			retries:            2,
-			conditionSucceeded: corev1.ConditionUnknown,
-			wantEvents: []string{
-				"Warning Failed PipelineRun \"test-pipeline-retry-run-with-timeout\" failed to finish within",
-			},
+	}, {
+		name:               "No more retries are needed",
+		retries:            2,
+		conditionSucceeded: corev1.ConditionUnknown,
+		wantEvents: []string{
+			"Warning Failed PipelineRun \"test-pipeline-retry-run-with-timeout\" failed to finish within",
 		},
-	}
-
-	for _, tc := range tcs {
-
+	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			ps := []*v1beta1.Pipeline{tb.Pipeline("test-pipeline-retry", tb.PipelineNamespace("foo"), tb.PipelineSpec(
 				tb.PipelineTask("hello-world-1", "hello-world", tb.Retries(tc.retries)),