@@ -26,7 +26,7 @@ import (
2626 "github.com/tektoncd/pipeline/pkg/apis/config"
2727 cfgtesting "github.com/tektoncd/pipeline/pkg/apis/config/testing"
2828 "github.com/tektoncd/pipeline/pkg/apis/pipeline/pod"
29- "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
29+ v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
3030 "github.com/tektoncd/pipeline/test/diff"
3131 corev1 "k8s.io/api/core/v1"
3232 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -55,6 +55,55 @@ func TestPipelineRunSpec_SetDefaults(t *testing.T) {
5555 ServiceAccountName : config .DefaultServiceAccountValue ,
5656 Timeout : & metav1.Duration {Duration : 500 * time .Millisecond },
5757 },
58+ }, {
59+ desc : "timeouts is nil" ,
60+ prs : & v1beta1.PipelineRunSpec {},
61+ want : & v1beta1.PipelineRunSpec {
62+ ServiceAccountName : config .DefaultServiceAccountValue ,
63+ Timeout : & metav1.Duration {Duration : config .DefaultTimeoutMinutes * time .Minute },
64+ },
65+ },
66+ {
67+ desc : "timeouts is not nil" ,
68+ prs : & v1beta1.PipelineRunSpec {
69+ Timeouts : & v1beta1.TimeoutFields {},
70+ },
71+ want : & v1beta1.PipelineRunSpec {
72+ ServiceAccountName : config .DefaultServiceAccountValue ,
73+ Timeouts : & v1beta1.TimeoutFields {
74+ Pipeline : & metav1.Duration {Duration : config .DefaultTimeoutMinutes * time .Minute },
75+ },
76+ },
77+ },
78+ {
79+ desc : "timeouts.pipeline is not nil" ,
80+ prs : & v1beta1.PipelineRunSpec {
81+ Timeouts : & v1beta1.TimeoutFields {
82+ Pipeline : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
83+ },
84+ },
85+ want : & v1beta1.PipelineRunSpec {
86+ ServiceAccountName : config .DefaultServiceAccountValue ,
87+ Timeouts : & v1beta1.TimeoutFields {
88+ Pipeline : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
89+ },
90+ },
91+ }, {
92+ desc : "timeouts.pipeline is nil with timeouts.tasks and timeouts.finally" ,
93+ prs : & v1beta1.PipelineRunSpec {
94+ Timeouts : & v1beta1.TimeoutFields {
95+ Tasks : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
96+ Finally : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
97+ },
98+ },
99+ want : & v1beta1.PipelineRunSpec {
100+ ServiceAccountName : config .DefaultServiceAccountValue ,
101+ Timeouts : & v1beta1.TimeoutFields {
102+ Pipeline : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes ) * time .Minute },
103+ Tasks : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
104+ Finally : & metav1.Duration {Duration : (config .DefaultTimeoutMinutes + 1 ) * time .Minute },
105+ },
106+ },
58107 },
59108 {
60109 desc : "pod template is nil" ,
0 commit comments