github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98489 from alculquicondor/job-testtable

Browse Source 
Make sync Job test tables more readable
This commit is contained in:
Kubernetes Prow Robot 2021-02-04 15:55:16 -08:00 committed by GitHub
commit 4eb9d825d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 355 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

346
pkg/controller/job/job_controller_test.go
View File

@ -163,113 +163,223 @@ func TestControllerSyncJob(t *testing.T) {
expectedConditionReason string expectedConditionReason string
}{ }{
"job start": { "job start": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 0, 0, 0, completions: 5,
2, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
expectedCreations: 2,
expectedActive: 2,
}, },
"WQ job start": { "WQ job start": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 0, 0, 0, completions: -1,
2, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
expectedCreations: 2,
expectedActive: 2,
}, },
"pending pods": { "pending pods": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 2, 0, 0, 0, completions: 5,
0, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
pendingPods: 2,
expectedActive: 2,
}, },
"correct # of pods": { "correct # of pods": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 2, 0, 0, completions: 5,
0, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 2,
expectedActive: 2,
}, },
"WQ job: correct # of pods": { "WQ job: correct # of pods": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 2, 0, 0, completions: -1,
0, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 2,
expectedActive: 2,
}, },
"too few active pods": { "too few active pods": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 1, 1, 0, completions: 5,
1, 0, 2, 1, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 1,
succeededPods: 1,
expectedCreations: 1,
expectedActive: 2,
expectedSucceeded: 1,
}, },
"too few active pods with a dynamic job": { "too few active pods with a dynamic job": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 1, 0, 0, completions: -1,
1, 0, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 1,
expectedCreations: 1,
expectedActive: 2,
}, },
"too few active pods, with controller error": { "too few active pods, with controller error": {
2, 5, 6, false, 0, parallelism: 2,
fmt.Errorf("fake error"), true, 0, 1, 1, 0, completions: 5,
1, 0, 1, 1, 0, nil, "", backoffLimit: 6,
podControllerError: fmt.Errorf("fake error"),
jobKeyForget: true,
activePods: 1,
succeededPods: 1,
expectedCreations: 1,
expectedActive: 1,
expectedSucceeded: 1,
}, },
"too many active pods": { "too many active pods": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 3, 0, 0, completions: 5,
0, 1, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 3,
expectedDeletions: 1,
expectedActive: 2,
}, },
"too many active pods, with controller error": { "too many active pods, with controller error": {
2, 5, 6, false, 0, parallelism: 2,
fmt.Errorf("fake error"), true, 0, 3, 0, 0, completions: 5,
0, 1, 3, 0, 0, nil, "", backoffLimit: 6,
podControllerError: fmt.Errorf("fake error"),
jobKeyForget: true,
activePods: 3,
expectedDeletions: 1,
expectedActive: 3,
}, },
"failed + succeed pods: reset backoff delay": { "failed + succeed pods: reset backoff delay": {
2, 5, 6, false, 0, parallelism: 2,
fmt.Errorf("fake error"), true, 0, 1, 1, 1, completions: 5,
1, 0, 1, 1, 1, nil, "", backoffLimit: 6,
podControllerError: fmt.Errorf("fake error"),
jobKeyForget: true,
activePods: 1,
succeededPods: 1,
failedPods: 1,
expectedCreations: 1,
expectedActive: 1,
expectedSucceeded: 1,
expectedFailed: 1,
}, },
"only new failed pod": { "new failed pod": {
2, 5, 6, false, 0, parallelism: 2,
fmt.Errorf("fake error"), false, 0, 1, 0, 1, completions: 5,
1, 0, 1, 0, 1, nil, "", backoffLimit: 6,
activePods: 1,
failedPods: 1,
expectedCreations: 1,
expectedActive: 2,
expectedFailed: 1,
},
"only new failed pod with controller error": {
parallelism: 2,
completions: 5,
backoffLimit: 6,
podControllerError: fmt.Errorf("fake error"),
activePods: 1,
failedPods: 1,
expectedCreations: 1,
expectedActive: 1,
expectedFailed: 1,
}, },
"job finish": { "job finish": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 0, 5, 0, completions: 5,
0, 0, 0, 5, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
succeededPods: 5,
expectedSucceeded: 5,
}, },
"WQ job finishing": { "WQ job finishing": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 1, 1, 0, completions: -1,
0, 0, 1, 1, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 1,
succeededPods: 1,
expectedActive: 1,
expectedSucceeded: 1,
}, },
"WQ job all finished": { "WQ job all finished": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 0, 2, 0, completions: -1,
0, 0, 0, 2, 0, &jobConditionComplete, "", backoffLimit: 6,
jobKeyForget: true,
succeededPods: 2,
expectedSucceeded: 2,
expectedCondition: &jobConditionComplete,
}, },
"WQ job all finished despite one failure": { "WQ job all finished despite one failure": {
2, -1, 6, false, 0, parallelism: 2,
nil, true, 0, 0, 1, 1, completions: -1,
0, 0, 0, 1, 1, &jobConditionComplete, "", backoffLimit: 6,
jobKeyForget: true,
succeededPods: 1,
failedPods: 1,
expectedSucceeded: 1,
expectedFailed: 1,
expectedCondition: &jobConditionComplete,
}, },
"more active pods than completions": { "more active pods than completions": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 10, 0, 0, completions: 5,
0, 8, 2, 0, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 10,
expectedDeletions: 8,
expectedActive: 2,
}, },
"status change": { "status change": {
2, 5, 6, false, 0, parallelism: 2,
nil, true, 0, 2, 2, 0, completions: 5,
0, 0, 2, 2, 0, nil, "", backoffLimit: 6,
jobKeyForget: true,
activePods: 2,
succeededPods: 2,
expectedActive: 2,
expectedSucceeded: 2,
}, },
"deleting job": { "deleting job": {
2, 5, 6, true, 0, parallelism: 2,
nil, true, 1, 1, 1, 0, completions: 5,
0, 0, 2, 1, 0, nil, "", backoffLimit: 6,
deleting: true,
jobKeyForget: true,
pendingPods: 1,
activePods: 1,
succeededPods: 1,
expectedActive: 2,
expectedSucceeded: 1,
}, },
"limited pods": { "limited pods": {
100, 200, 6, false, 10, parallelism: 100,
nil, true, 0, 0, 0, 0, completions: 200,
10, 0, 10, 0, 0, nil, "", backoffLimit: 6,
podLimit: 10,
jobKeyForget: true,
expectedCreations: 10,
expectedActive: 10,
}, },
"too many job failures": { "too many job failures": {
2, 5, 0, true, 0, parallelism: 2,
nil, true, 0, 0, 0, 1, completions: 5,
0, 0, 0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded", deleting: true,
jobKeyForget: true,
failedPods: 1,
expectedFailed: 1,
expectedCondition: &jobConditionFailed,
expectedConditionReason: "BackoffLimitExceeded",
}, },
} }
for name, tc := range testCases { for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
// job manager setup // job manager setup
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
manager, sharedInformerFactory := newControllerFromClient(clientset, controller.NoResyncPeriodFunc) manager, sharedInformerFactory := newControllerFromClient(clientset, controller.NoResyncPeriodFunc)
@ -299,26 +409,32 @@ func TestControllerSyncJob(t *testing.T) {
// We need requeue syncJob task if podController error // We need requeue syncJob task if podController error
if tc.podControllerError != nil { if tc.podControllerError != nil {
if err == nil { if err == nil {
t.Errorf("%s: Syncing jobs would return error when podController exception", name) t.Error("Syncing jobs expected to return error on podControl exception")
} }
} else { } else if tc.failedPods > 0 && tc.expectedCondition == nil {
if err != nil && (tc.podLimit == 0 || fakePodControl.CreateCallCount < tc.podLimit) { if err == nil {
t.Errorf("%s: unexpected error when syncing jobs %v", name, err) t.Error("Syncing jobs expected to return error when there are new failed pods and Job didn't finish")
} }
} else if tc.podLimit != 0 && fakePodControl.CreateCallCount > tc.podLimit {
if err == nil {
t.Error("Syncing jobs expected to return error when reached the podControl limit")
}
} else if err != nil {
t.Errorf("Unexpected error when syncing jobs: %v", err)
} }
if forget != tc.jobKeyForget { if forget != tc.jobKeyForget {
t.Errorf("%s: unexpected forget value. Expected %v, saw %v\n", name, tc.jobKeyForget, forget) t.Errorf("Unexpected forget value. Expected %v, saw %v\n", tc.jobKeyForget, forget)
} }
// validate created/deleted pods // validate created/deleted pods
if int32(len(fakePodControl.Templates)) != tc.expectedCreations { if int32(len(fakePodControl.Templates)) != tc.expectedCreations {
t.Errorf("%s: unexpected number of creates. Expected %d, saw %d\n", name, tc.expectedCreations, len(fakePodControl.Templates)) t.Errorf("Unexpected number of creates. Expected %d, saw %d\n", tc.expectedCreations, len(fakePodControl.Templates))
} }
if int32(len(fakePodControl.DeletePodName)) != tc.expectedDeletions { if int32(len(fakePodControl.DeletePodName)) != tc.expectedDeletions {
t.Errorf("%s: unexpected number of deletes. Expected %d, saw %d\n", name, tc.expectedDeletions, len(fakePodControl.DeletePodName)) t.Errorf("Unexpected number of deletes. Expected %d, saw %d\n", tc.expectedDeletions, len(fakePodControl.DeletePodName))
} }
// Each create should have an accompanying ControllerRef. // Each create should have an accompanying ControllerRef.
if len(fakePodControl.ControllerRefs) != int(tc.expectedCreations) { if len(fakePodControl.ControllerRefs) != int(tc.expectedCreations) {
t.Errorf("%s: unexpected number of ControllerRefs. Expected %d, saw %d\n", name, tc.expectedCreations, len(fakePodControl.ControllerRefs)) t.Errorf("Unexpected number of ControllerRefs. Expected %d, saw %d\n", tc.expectedCreations, len(fakePodControl.ControllerRefs))
} }
// Make sure the ControllerRefs are correct. // Make sure the ControllerRefs are correct.
for _, controllerRef := range fakePodControl.ControllerRefs { for _, controllerRef := range fakePodControl.ControllerRefs {
@ -340,20 +456,20 @@ func TestControllerSyncJob(t *testing.T) {
} }
// validate status // validate status
if actual.Status.Active != tc.expectedActive { if actual.Status.Active != tc.expectedActive {
t.Errorf("%s: unexpected number of active pods. Expected %d, saw %d\n", name, tc.expectedActive, actual.Status.Active) t.Errorf("Unexpected number of active pods. Expected %d, saw %d\n", tc.expectedActive, actual.Status.Active)
} }
if actual.Status.Succeeded != tc.expectedSucceeded { if actual.Status.Succeeded != tc.expectedSucceeded {
t.Errorf("%s: unexpected number of succeeded pods. Expected %d, saw %d\n", name, tc.expectedSucceeded, actual.Status.Succeeded) t.Errorf("Unexpected number of succeeded pods. Expected %d, saw %d\n", tc.expectedSucceeded, actual.Status.Succeeded)
} }
if actual.Status.Failed != tc.expectedFailed { if actual.Status.Failed != tc.expectedFailed {
t.Errorf("%s: unexpected number of failed pods. Expected %d, saw %d\n", name, tc.expectedFailed, actual.Status.Failed) t.Errorf("Unexpected number of failed pods. Expected %d, saw %d\n", tc.expectedFailed, actual.Status.Failed)
} }
if actual.Status.StartTime == nil { if actual.Status.StartTime == nil {
t.Errorf("%s: .status.startTime was not set", name) t.Error("Missing .status.startTime")
} }
// validate conditions // validate conditions
if tc.expectedCondition != nil && !getCondition(actual, *tc.expectedCondition, tc.expectedConditionReason) { if tc.expectedCondition != nil && !getCondition(actual, *tc.expectedCondition, tc.expectedConditionReason) {
t.Errorf("%s: expected completion condition. Got %#v", name, actual.Status.Conditions) t.Errorf("Expected completion condition. Got %#v", actual.Status.Conditions)
} }
// validate slow start // validate slow start
expectedLimit := 0 expectedLimit := 0
@ -361,8 +477,9 @@ func TestControllerSyncJob(t *testing.T) {
expectedLimit += controller.SlowStartInitialBatchSize << pass expectedLimit += controller.SlowStartInitialBatchSize << pass
} }
if tc.podLimit > 0 && fakePodControl.CreateCallCount > expectedLimit { if tc.podLimit > 0 && fakePodControl.CreateCallCount > expectedLimit {
t.Errorf("%s: Unexpected number of create calls. Expected <= %d, saw %d\n", name, fakePodControl.CreateLimit*2, fakePodControl.CreateCallCount) t.Errorf("Unexpected number of create calls. Expected <= %d, saw %d\n", fakePodControl.CreateLimit*2, fakePodControl.CreateCallCount)
} }
})
} }
} }
@ -389,31 +506,57 @@ func TestSyncJobPastDeadline(t *testing.T) {
expectedConditionReason string expectedConditionReason string
}{ }{
"activeDeadlineSeconds less than single pod execution": { "activeDeadlineSeconds less than single pod execution": {
1, 1, 10, 15, 6, parallelism: 1,
1, 0, 0, completions: 1,
true, 1, 0, 0, 1, "DeadlineExceeded", activeDeadlineSeconds: 10,
startTime: 15,
backoffLimit: 6,
activePods: 1,
expectedForGetKey: true,
expectedDeletions: 1,
expectedFailed: 1,
expectedConditionReason: "DeadlineExceeded",
}, },
"activeDeadlineSeconds bigger than single pod execution": { "activeDeadlineSeconds bigger than single pod execution": {
1, 2, 10, 15, 6, parallelism: 1,
1, 1, 0, completions: 2,
true, 1, 0, 1, 1, "DeadlineExceeded", activeDeadlineSeconds: 10,
startTime: 15,
backoffLimit: 6,
activePods: 1,
succeededPods: 1,
expectedForGetKey: true,
expectedDeletions: 1,
expectedSucceeded: 1,
expectedFailed: 1,
expectedConditionReason: "DeadlineExceeded",
}, },
"activeDeadlineSeconds times-out before any pod starts": { "activeDeadlineSeconds times-out before any pod starts": {
1, 1, 10, 10, 6, parallelism: 1,
0, 0, 0, completions: 1,
true, 0, 0, 0, 0, "DeadlineExceeded", activeDeadlineSeconds: 10,
startTime: 10,
backoffLimit: 6,
expectedForGetKey: true,
expectedConditionReason: "DeadlineExceeded",
}, },
"activeDeadlineSeconds with backofflimit reach": { "activeDeadlineSeconds with backofflimit reach": {
1, 1, 1, 10, 0, parallelism: 1,
0, 0, 1, completions: 1,
true, 0, 0, 0, 1, "BackoffLimitExceeded", activeDeadlineSeconds: 1,
startTime: 10,
failedPods: 1,
expectedForGetKey: true,
expectedFailed: 1,
expectedConditionReason: "BackoffLimitExceeded",
}, },
} }
for name, tc := range testCases { for name, tc := range testCases {
t.Run(name, func(t *testing.T) {
// job manager setup // job manager setup
clientset := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}}) clientSet := clientset.NewForConfigOrDie(&restclient.Config{Host: "", ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
manager, sharedInformerFactory := newControllerFromClient(clientset, controller.NoResyncPeriodFunc) manager, sharedInformerFactory := newControllerFromClient(clientSet, controller.NoResyncPeriodFunc)
fakePodControl := controller.FakePodControl{} fakePodControl := controller.FakePodControl{}
manager.podControl = &fakePodControl manager.podControl = &fakePodControl
manager.podStoreSynced = alwaysReady manager.podStoreSynced = alwaysReady
@ -436,35 +579,36 @@ func TestSyncJobPastDeadline(t *testing.T) {
// run // run
forget, err := manager.syncJob(testutil.GetKey(job, t)) forget, err := manager.syncJob(testutil.GetKey(job, t))
if err != nil { if err != nil {
t.Errorf("%s: unexpected error when syncing jobs %v", name, err) t.Errorf("Unexpected error when syncing jobs %v", err)
} }
if forget != tc.expectedForGetKey { if forget != tc.expectedForGetKey {
t.Errorf("%s: unexpected forget value. Expected %v, saw %v\n", name, tc.expectedForGetKey, forget) t.Errorf("Unexpected forget value. Expected %v, saw %v\n", tc.expectedForGetKey, forget)
} }
// validate created/deleted pods // validate created/deleted pods
if int32(len(fakePodControl.Templates)) != 0 { if int32(len(fakePodControl.Templates)) != 0 {
t.Errorf("%s: unexpected number of creates. Expected 0, saw %d\n", name, len(fakePodControl.Templates)) t.Errorf("Unexpected number of creates. Expected 0, saw %d\n", len(fakePodControl.Templates))
} }
if int32(len(fakePodControl.DeletePodName)) != tc.expectedDeletions { if int32(len(fakePodControl.DeletePodName)) != tc.expectedDeletions {
t.Errorf("%s: unexpected number of deletes. Expected %d, saw %d\n", name, tc.expectedDeletions, len(fakePodControl.DeletePodName)) t.Errorf("Unexpected number of deletes. Expected %d, saw %d\n", tc.expectedDeletions, len(fakePodControl.DeletePodName))
} }
// validate status // validate status
if actual.Status.Active != tc.expectedActive { if actual.Status.Active != tc.expectedActive {
t.Errorf("%s: unexpected number of active pods. Expected %d, saw %d\n", name, tc.expectedActive, actual.Status.Active) t.Errorf("Unexpected number of active pods. Expected %d, saw %d\n", tc.expectedActive, actual.Status.Active)
} }
if actual.Status.Succeeded != tc.expectedSucceeded { if actual.Status.Succeeded != tc.expectedSucceeded {
t.Errorf("%s: unexpected number of succeeded pods. Expected %d, saw %d\n", name, tc.expectedSucceeded, actual.Status.Succeeded) t.Errorf("Unexpected number of succeeded pods. Expected %d, saw %d\n", tc.expectedSucceeded, actual.Status.Succeeded)
} }
if actual.Status.Failed != tc.expectedFailed { if actual.Status.Failed != tc.expectedFailed {
t.Errorf("%s: unexpected number of failed pods. Expected %d, saw %d\n", name, tc.expectedFailed, actual.Status.Failed) t.Errorf("Unexpected number of failed pods. Expected %d, saw %d\n", tc.expectedFailed, actual.Status.Failed)
} }
if actual.Status.StartTime == nil { if actual.Status.StartTime == nil {
t.Errorf("%s: .status.startTime was not set", name) t.Error("Missing .status.startTime")
} }
// validate conditions // validate conditions
if !getCondition(actual, batch.JobFailed, tc.expectedConditionReason) { if !getCondition(actual, batch.JobFailed, tc.expectedConditionReason) {
t.Errorf("%s: expected fail condition. Got %#v", name, actual.Status.Conditions) t.Errorf("Expected fail condition. Got %#v", actual.Status.Conditions)
} }
})
} }
} }