Merge pull request #129927 from mimowo/fix-job-int-test-1.31

Cherry-pick #129894 and #129913: Deflake job integration test 1.31
This commit is contained in:
Kubernetes Prow Robot 2025-02-04 08:38:59 -08:00 committed by GitHub
commit 93e460114d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -654,7 +654,7 @@ func TestSuccessPolicy(t *testing.T) {
wantFailed: 0, wantFailed: 0,
wantSucceeded: 1, wantSucceeded: 1,
wantCompletedIndexes: "1", wantCompletedIndexes: "1",
wantTerminating: ptr.To[int32](1), wantTerminating: ptr.To[int32](0),
}, },
}, },
wantConditionTypes: []batchv1.JobConditionType{batchv1.JobSuccessCriteriaMet, batchv1.JobComplete}, wantConditionTypes: []batchv1.JobConditionType{batchv1.JobSuccessCriteriaMet, batchv1.JobComplete},
@ -701,7 +701,7 @@ func TestSuccessPolicy(t *testing.T) {
wantFailed: 0, wantFailed: 0,
wantSucceeded: 1, wantSucceeded: 1,
wantCompletedIndexes: "1", wantCompletedIndexes: "1",
wantTerminating: ptr.To[int32](1), wantTerminating: ptr.To[int32](0),
}, },
}, },
wantConditionTypes: []batchv1.JobConditionType{batchv1.JobSuccessCriteriaMet, batchv1.JobComplete}, wantConditionTypes: []batchv1.JobConditionType{batchv1.JobSuccessCriteriaMet, batchv1.JobComplete},
@ -1719,7 +1719,7 @@ func TestBackoffLimitPerIndex(t *testing.T) {
}, },
wantFailed: 5, wantFailed: 5,
wantFailedIndexes: ptr.To(""), wantFailedIndexes: ptr.To(""),
wantTerminating: ptr.To[int32](2), wantTerminating: ptr.To[int32](0),
}, },
}, },
wantJobConditionType: batchv1.JobFailed, wantJobConditionType: batchv1.JobFailed,
@ -1811,7 +1811,7 @@ func TestBackoffLimitPerIndex(t *testing.T) {
wantActive: 0, wantActive: 0,
wantFailed: 3, wantFailed: 3,
wantFailedIndexes: ptr.To("0,1"), wantFailedIndexes: ptr.To("0,1"),
wantTerminating: ptr.To[int32](1), wantTerminating: ptr.To[int32](0),
}, },
}, },
wantJobConditionType: batchv1.JobFailed, wantJobConditionType: batchv1.JobFailed,