karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1768 from ikaven1024/fix-ut 

Fix occasionally TestAggregateJobStatus time error
This commit is contained in:
karmada-bot 2022-05-12 10:35:42 +08:00 committed by GitHub
parent 2a9d106288 4518b0e497
commit dfd158270c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/resourceinterpreter/defaultinterpreter/aggregatestatus_test.go
View File

@ -203,11 +203,11 @@ func TestAggregateJobStatus(t *testing.T) {
}
oldJob := &batchv1.Job{}
newJob := &batchv1.Job{Status: batchv1.JobStatus{Active: 0, Succeeded: 2, Failed: 0, StartTime: &startTime, CompletionTime: &completionTime, Conditions: []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue, LastProbeTime: metav1.Now(), LastTransitionTime: metav1.Now(), Reason: "Completed", Message: "Job completed"}}}}
newJob := &batchv1.Job{Status: batchv1.JobStatus{Active: 0, Succeeded: 2, Failed: 0, StartTime: &startTime, CompletionTime: &completionTime, Conditions: []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue, Reason: "Completed", Message: "Job completed"}}}}
oldObj, _ := helper.ToUnstructured(oldJob)
newObj, _ := helper.ToUnstructured(newJob)
newJobWithJobFailed := &batchv1.Job{Status: batchv1.JobStatus{Active: 0, Succeeded: 1, Failed: 1, StartTime: &startTime, CompletionTime: &completionTime, Conditions: []batchv1.JobCondition{{Type: batchv1.JobFailed, Status: corev1.ConditionTrue, LastProbeTime: metav1.Now(), LastTransitionTime: metav1.Now(), Reason: "JobFailed", Message: "Job executed failed in member clusters member2"}}}}
newJobWithJobFailed := &batchv1.Job{Status: batchv1.JobStatus{Active: 0, Succeeded: 1, Failed: 1, StartTime: &startTime, CompletionTime: &completionTime, Conditions: []batchv1.JobCondition{{Type: batchv1.JobFailed, Status: corev1.ConditionTrue, Reason: "JobFailed", Message: "Job executed failed in member clusters member2"}}}}
newObjWithJobFailed, _ := helper.ToUnstructured(newJobWithJobFailed)
tests := []struct {
@ -238,6 +238,8 @@ func TestAggregateJobStatus(t *testing.T) {
for _, tt := range tests {
actualObj, _ := aggregateJobStatus(tt.curObj, tt.aggregatedStatusItems)
// Clean condition time before compare, due to issue: https://github.com/karmada-io/karmada/issues/1767
actualObj = cleanUnstructuredJobConditionTime(actualObj)
assert.Equal(t, tt.expectedObj, actualObj)
}
}
@ -333,3 +335,14 @@ func TestAggregateStatefulSetStatus(t *testing.T) {
assert.Equal(t, tt.expectedObj, actualObj)
}
}
func cleanUnstructuredJobConditionTime(object *unstructured.Unstructured) *unstructured.Unstructured {
job, _ := helper.ConvertToJob(object)
for i := range job.Status.Conditions {
cond := &job.Status.Conditions[i]
cond.LastProbeTime = metav1.Time{}
cond.LastTransitionTime = metav1.Time{}
}
ret, _ := helper.ToUnstructured(job)
return ret
}