Merge pull request kubernetes#119506 from mimowo/fix-job-controller-flaky-test

k8s-ci-robot · web-flow · commit a30f6b7922d3 · 2023-07-21T09:30:07.000-07:00
Fix the flaky TestJobApiBackoffReset test
diff --git a/pkg/controller/job/job_controller_test.go b/pkg/controller/job/job_controller_test.go
@@ -4676,10 +4676,11 @@ func TestJobApiBackoffReset(t *testing.T) {
 	if retries != 1 {
 		t.Fatalf("%s: expected exactly 1 retry, got %d", job.Name, retries)
 	}
+	// await for the actual requeue after processing of the pending queue is done
+	awaitForQueueLen(ctx, t, manager, 1)
 
 	// the queue is emptied on success
 	fakePodControl.Err = nil
-	manager.clock.Sleep(fastJobApiBackoff)
 	manager.processNextWorkItem(context.TODO())
 	verifyEmptyQueue(ctx, t, manager)
 }

Original file line number	Diff line number	Diff line change
`@@ -4676,10 +4676,11 @@ func TestJobApiBackoffReset(t *testing.T) {`
`4676`	`4676`	`if retries != 1 {`
`4677`	`4677`	`t.Fatalf("%s: expected exactly 1 retry, got %d", job.Name, retries)`
`4678`	`4678`	`}`
	`4679`	`+ // await for the actual requeue after processing of the pending queue is done`
	`4680`	`+ awaitForQueueLen(ctx, t, manager, 1)`
`4679`	`4681`
`4680`	`4682`	`// the queue is emptied on success`
`4681`	`4683`	`fakePodControl.Err = nil`
`4682`		`- manager.clock.Sleep(fastJobApiBackoff)`
`4683`	`4684`	`manager.processNextWorkItem(context.TODO())`
`4684`	`4685`	`verifyEmptyQueue(ctx, t, manager)`
`4685`	`4686`	`}`