fix tests for the changed DecorationConfig

kubernetes · May 1, 2019 · d7a576f · d7a576f
1 parent f865b32
commit d7a576f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/prow/apis/prowjobs/v1/types_test.go b/prow/apis/prowjobs/v1/types_test.go
@@ -42,7 +42,7 @@ func TestDecorationDefaulting(t *testing.T) {
 		{
 			name: "timeout provided",
 			provided: &DecorationConfig{
-				Timeout: Duration{Duration: 10 * time.Minute},
+				Timeout: &Duration{Duration: 10 * time.Minute},
 			},
 			expected: func(orig, def *DecorationConfig) *DecorationConfig {
 				def.Timeout = orig.Timeout
@@ -52,7 +52,7 @@ func TestDecorationDefaulting(t *testing.T) {
 		{
 			name: "grace period provided",
 			provided: &DecorationConfig{
-				GracePeriod: Duration{Duration: 10 * time.Hour},
+				GracePeriod: &Duration{Duration: 10 * time.Hour},
 			},
 			expected: func(orig, def *DecorationConfig) *DecorationConfig {
 				def.GracePeriod = orig.GracePeriod
@@ -163,8 +163,8 @@ func TestDecorationDefaulting(t *testing.T) {
 		tc := testCase
 		t.Run(tc.name, func(t *testing.T) {
 			defaults := &DecorationConfig{
-				Timeout:     Duration{Duration: 1 * time.Minute},
-				GracePeriod: Duration{Duration: 10 * time.Second},
+				Timeout:     &Duration{Duration: 1 * time.Minute},
+				GracePeriod: &Duration{Duration: 10 * time.Second},
 				UtilityImages: &UtilityImages{
 					CloneRefs:  "clonerefs",
 					InitUpload: "initupload",

diff --git a/prow/cmd/build/controller_test.go b/prow/cmd/build/controller_test.go
@@ -1469,6 +1469,8 @@ func TestMakeBuild(t *testing.T) {
 				pj.Spec.ExtraRefs = []prowjobv1.Refs{{Org: "bonus"}}
 				pj.Spec.DecorationConfig = &prowjobv1.DecorationConfig{
 					UtilityImages: &prowjobv1.UtilityImages{},
+					Timeout:       &prowjobv1.Duration{Duration: 0},
+					GracePeriod:   &prowjobv1.Duration{Duration: 0},
 				}
 				return pj
 			},
@@ -1479,6 +1481,8 @@ func TestMakeBuild(t *testing.T) {
 				pj.Spec.ExtraRefs = []prowjobv1.Refs{{Org: "bonus"}}
 				pj.Spec.DecorationConfig = &prowjobv1.DecorationConfig{
 					UtilityImages: &prowjobv1.UtilityImages{},
+					Timeout:       &prowjobv1.Duration{Duration: 0},
+					GracePeriod:   &prowjobv1.Duration{Duration: 0},
 				}
 				pj.Spec.BuildSpec.Source = &buildv1alpha1.SourceSpec{}
 				return pj
@@ -1542,8 +1546,8 @@ func TestMakeBuild(t *testing.T) {
 
 func TestDecorateSteps(t *testing.T) {
 	var dc prowjobv1.DecorationConfig
-	dc.Timeout = prowjobv1.Duration{Duration: 10 * time.Minute}
-	dc.GracePeriod = prowjobv1.Duration{Duration: 5 * time.Minute}
+	dc.Timeout = &prowjobv1.Duration{Duration: 10 * time.Minute}
+	dc.GracePeriod = &prowjobv1.Duration{Duration: 5 * time.Minute}
 	_, tm := tools()
 	tm.Name += "not-static"
 	tm.MountPath += "fancy"
@@ -1739,6 +1743,9 @@ func TestInjectTimeout(t *testing.T) {
 
 			dc := prowjobv1.DecorationConfig{
 				UtilityImages: &prowjobv1.UtilityImages{},
+				Timeout: &prowjobv1.Duration{
+					Duration: defaultTimeout,
+				},
 			}
 			if tc.decoratedTimeout != nil {
 				dc.Timeout.Duration = *tc.decoratedTimeout

diff --git a/prow/config/config_test.go b/prow/config/config_test.go
@@ -323,8 +323,8 @@ periodics:
       - "test"
       - "./..."`,
 			expected: &prowapi.DecorationConfig{
-				Timeout:     prowapi.Duration{Duration: 2 * time.Hour},
-				GracePeriod: prowapi.Duration{Duration: 15 * time.Second},
+				Timeout:     &prowapi.Duration{Duration: 2 * time.Hour},
+				GracePeriod: &prowapi.Duration{Duration: 15 * time.Second},
 				UtilityImages: &prowapi.UtilityImages{
 					CloneRefs:  "clonerefs:default",
 					InitUpload: "initupload:default",
@@ -382,8 +382,8 @@ periodics:
       - "test"
       - "./..."`,
 			expected: &prowapi.DecorationConfig{
-				Timeout:     prowapi.Duration{Duration: 1 * time.Nanosecond},
-				GracePeriod: prowapi.Duration{Duration: 1 * time.Nanosecond},
+				Timeout:     &prowapi.Duration{Duration: 1 * time.Nanosecond},
+				GracePeriod: &prowapi.Duration{Duration: 1 * time.Nanosecond},
 				UtilityImages: &prowapi.UtilityImages{
 					CloneRefs:  "clonerefs:explicit",
 					InitUpload: "initupload:explicit",

diff --git a/prow/pod-utils/decorate/podspec_test.go b/prow/pod-utils/decorate/podspec_test.go
@@ -456,8 +456,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PresubmitJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",
@@ -677,8 +677,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PresubmitJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",
@@ -898,8 +898,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PresubmitJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",
@@ -1145,8 +1145,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PresubmitJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",
@@ -1391,8 +1391,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PeriodicJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",
@@ -1554,8 +1554,8 @@ func TestProwJobToPod(t *testing.T) {
 				Type: prowapi.PresubmitJob,
 				Job:  "job-name",
 				DecorationConfig: &prowapi.DecorationConfig{
-					Timeout:     prowapi.Duration{Duration: 120 * time.Minute},
-					GracePeriod: prowapi.Duration{Duration: 10 * time.Second},
+					Timeout:     &prowapi.Duration{Duration: 120 * time.Minute},
+					GracePeriod: &prowapi.Duration{Duration: 10 * time.Second},
 					UtilityImages: &prowapi.UtilityImages{
 						CloneRefs:  "clonerefs:tag",
 						InitUpload: "initupload:tag",