Skip to content

Commit

Permalink
Adjust taskrunpod files to match gofmt results.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
EliZucker authored and tekton-robot committed Jul 22, 2019
1 parent 2866b62 commit ac0b5c6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
11 changes: 4 additions & 7 deletions pkg/reconciler/v1alpha1/taskrun/timeout_check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}}

Expand Down
10 changes: 5 additions & 5 deletions pkg/status/taskrunpod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
})
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions pkg/status/taskrunpod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit ac0b5c6

Please sign in to comment.