From ac0b5c60153b8ebf0e7f33a217158db8d5f0a820 Mon Sep 17 00:00:00 2001 From: Eli Zucker Date: Tue, 16 Jul 2019 15:23:42 -0400 Subject: [PATCH] Adjust taskrunpod files to match gofmt results. Running gofmt on pipelines is completely clean, except for these 3 files which don't match GoLang's linting rules. This commit cleans that up. --- pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go | 11 ++++------- pkg/status/taskrunpod.go | 10 +++++----- pkg/status/taskrunpod_test.go | 10 +++++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go b/pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go index 55991e330a2..6187ddcb9ed 100644 --- a/pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go +++ b/pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go @@ -37,22 +37,19 @@ func TestCheckTimeout(t *testing.T) { name: "TaskRun not started", taskRun: tb.TaskRun("test-taskrun-not-started", "foo", tb.TaskRunSpec( tb.TaskRunTaskRef(simpleTask.Name), - ), tb.TaskRunStatus(tb.Condition(apis.Condition{ - }), tb.TaskRunStartTime(zeroTime))), + ), tb.TaskRunStatus(tb.Condition(apis.Condition{}), tb.TaskRunStartTime(zeroTime))), expectedStatus: false, }, { name: "TaskRun no timeout", taskRun: tb.TaskRun("test-taskrun-no-timeout", "foo", tb.TaskRunSpec( tb.TaskRunTaskRef(simpleTask.Name), tb.TaskRunTimeout(0), - ), tb.TaskRunStatus(tb.Condition(apis.Condition{ - }), tb.TaskRunStartTime(time.Now().Add(-15 * time.Hour)))), + ), tb.TaskRunStatus(tb.Condition(apis.Condition{}), tb.TaskRunStartTime(time.Now().Add(-15*time.Hour)))), expectedStatus: false, }, { name: "TaskRun timed out", taskRun: tb.TaskRun("test-taskrun-timeout", "foo", tb.TaskRunSpec( - tb.TaskRunTaskRef(simpleTask.Name), tb.TaskRunTimeout(10 * time.Second), - ), tb.TaskRunStatus(tb.Condition(apis.Condition{ - }), tb.TaskRunStartTime(time.Now().Add(-15 * time.Second)))), + tb.TaskRunTaskRef(simpleTask.Name), tb.TaskRunTimeout(10*time.Second), + ), tb.TaskRunStatus(tb.Condition(apis.Condition{}), tb.TaskRunStartTime(time.Now().Add(-15*time.Second)))), expectedStatus: true, }} diff --git a/pkg/status/taskrunpod.go b/pkg/status/taskrunpod.go index 162f1f99584..4a956294e67 100644 --- a/pkg/status/taskrunpod.go +++ b/pkg/status/taskrunpod.go @@ -64,8 +64,8 @@ func updateCompletedTaskRun(taskRun *v1alpha1.TaskRun, pod *corev1.Pod) { }) } else { taskRun.Status.SetCondition(&apis.Condition{ - Type: apis.ConditionSucceeded, - Status: corev1.ConditionTrue, + Type: apis.ConditionSucceeded, + Status: corev1.ConditionTrue, Reason: ReasonSucceeded, Message: "All Steps have completed executing", }) @@ -78,9 +78,9 @@ func updateIncompleteTaskRun(taskRun *v1alpha1.TaskRun, pod *corev1.Pod) { switch pod.Status.Phase { case corev1.PodRunning: taskRun.Status.SetCondition(&apis.Condition{ - Type: apis.ConditionSucceeded, - Status: corev1.ConditionUnknown, - Reason: ReasonBuilding, + Type: apis.ConditionSucceeded, + Status: corev1.ConditionUnknown, + Reason: ReasonBuilding, Message: "Not all Steps in the Task have finished executing", }) case corev1.PodPending: diff --git a/pkg/status/taskrunpod_test.go b/pkg/status/taskrunpod_test.go index 3218a0bc7d2..2d5518a839b 100644 --- a/pkg/status/taskrunpod_test.go +++ b/pkg/status/taskrunpod_test.go @@ -28,15 +28,15 @@ func TestUpdateStatusFromPod(t *testing.T) { Message: ReasonRunning, } conditionTrue := apis.Condition{ - Type: apis.ConditionSucceeded, - Status: corev1.ConditionTrue, + Type: apis.ConditionSucceeded, + Status: corev1.ConditionTrue, Reason: ReasonSucceeded, Message: "All Steps have completed executing", } conditionBuilding := apis.Condition{ - Type: apis.ConditionSucceeded, - Status: corev1.ConditionUnknown, - Reason: ReasonBuilding, + Type: apis.ConditionSucceeded, + Status: corev1.ConditionUnknown, + Reason: ReasonBuilding, Message: "Not all Steps in the Task have finished executing", } for _, c := range []struct {