github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #123826 from tenzen-y/use-fake-client-job-unit

Browse Source 
Job: Use the fake clock in TestTrackJobStatusAndRemoveFinalizers
This commit is contained in:
Kubernetes Prow Robot 2024-03-08 15:11:13 -08:00 committed by GitHub
commit d3d06c3c7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1274,9 +1274,12 @@ func TestGetNewFinshedPods(t *testing.T) {
func TestTrackJobStatusAndRemoveFinalizers(t *testing.T) { func TestTrackJobStatusAndRemoveFinalizers(t *testing.T) {
logger, ctx := ktesting.NewTestContext(t) logger, ctx := ktesting.NewTestContext(t)
completedCond := newCondition(batch.JobComplete, v1.ConditionTrue, "", "", realClock.Now()) fakeClock := clocktesting.NewFakeClock(time.Now())
succeededCond := newCondition(batch.JobSuccessCriteriaMet, v1.ConditionTrue, "", "", realClock.Now()) now := fakeClock.Now()
failedCond := newCondition(batch.JobFailed, v1.ConditionTrue, "", "", realClock.Now()) minuteAgo := now.Add(-time.Minute)
completedCond := newCondition(batch.JobComplete, v1.ConditionTrue, "", "", now)
succeededCond := newCondition(batch.JobSuccessCriteriaMet, v1.ConditionTrue, "", "", minuteAgo)
failedCond := newCondition(batch.JobFailed, v1.ConditionTrue, "", "", now)
indexedCompletion := batch.IndexedCompletion indexedCompletion := batch.IndexedCompletion
mockErr := errors.New("mock error") mockErr := errors.New("mock error")
cases := map[string]struct { cases := map[string]struct {
@ -1443,7 +1446,7 @@ func TestTrackJobStatusAndRemoveFinalizers(t *testing.T) {
Succeeded: 1, Succeeded: 1,
Failed: 1, Failed: 1,
Conditions: []batch.JobCondition{*succeededCond, *completedCond}, Conditions: []batch.JobCondition{*succeededCond, *completedCond},
CompletionTime: &succeededCond.LastTransitionTime, CompletionTime: ptr.To(metav1.NewTime(now)),
}, },
}, },
wantSucceededPodsMetric: 1, wantSucceededPodsMetric: 1,
@ -1933,7 +1936,7 @@ func TestTrackJobStatusAndRemoveFinalizers(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobSuccessPolicy, tc.enableJobSuccessPolicy)() defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobSuccessPolicy, tc.enableJobSuccessPolicy)()
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, _ := newControllerFromClient(ctx, t, clientSet, controller.NoResyncPeriodFunc) manager, _ := newControllerFromClientWithClock(ctx, t, clientSet, controller.NoResyncPeriodFunc, fakeClock)
fakePodControl := controller.FakePodControl{Err: tc.podControlErr} fakePodControl := controller.FakePodControl{Err: tc.podControlErr}
metrics.JobPodsFinished.Reset() metrics.JobPodsFinished.Reset()
manager.podControl = &fakePodControl manager.podControl = &fakePodControl
@ -1966,24 +1969,10 @@ func TestTrackJobStatusAndRemoveFinalizers(t *testing.T) {
if !errors.Is(err, tc.wantErr) { if !errors.Is(err, tc.wantErr) {
t.Errorf("Got error %v, want %v", err, tc.wantErr) t.Errorf("Got error %v, want %v", err, tc.wantErr)
} }
cmpOpts := []cmp.Option{cmpopts.IgnoreFields(batch.JobCondition{}, "LastProbeTime", "LastTransitionTime")} if diff := cmp.Diff(tc.wantStatusUpdates, statusUpdates,
if tc.finishedCond != nil && tc.finishedCond.Type == batch.JobSuccessCriteriaMet { cmpopts.IgnoreFields(batch.JobCondition{}, "LastProbeTime", "LastTransitionTime")); diff != "" {
cmpOpts = append(cmpOpts, cmpopts.IgnoreFields(batch.JobStatus{}, "CompletionTime"))
}
if diff := cmp.Diff(tc.wantStatusUpdates, statusUpdates, cmpOpts...); diff != "" {
t.Errorf("Unexpected status updates (-want,+got):\n%s", diff) t.Errorf("Unexpected status updates (-want,+got):\n%s", diff)
} }
// If we set successCondition with the SuccessCriteriaMet, the job-controller adds the Complete condition to the Job while reconciling,
// then the added Complete condition LastTransitionTime is used as a CompletionTime.
// So, we verify if the CompletionTime is after the SuccessCriteriaMet LastTransitionTime.
if tc.finishedCond != nil && tc.finishedCond.Type == batch.JobSuccessCriteriaMet && len(tc.wantStatusUpdates) != 0 {
for i := range tc.wantStatusUpdates {
if tc.wantStatusUpdates[i].CompletionTime != nil && !tc.wantStatusUpdates[i].CompletionTime.Before(statusUpdates[i].CompletionTime) {
t.Errorf("Unexpected completionTime; completionTime %v must be after %v",
tc.wantStatusUpdates[i].CompletionTime, statusUpdates[i].CompletionTime)
}
}
}
rmFinalizers := len(fakePodControl.Patches) rmFinalizers := len(fakePodControl.Patches)
if rmFinalizers != tc.wantRmFinalizers { if rmFinalizers != tc.wantRmFinalizers {
t.Errorf("Removed %d finalizers, want %d", rmFinalizers, tc.wantRmFinalizers) t.Errorf("Removed %d finalizers, want %d", rmFinalizers, tc.wantRmFinalizers)