From 9bf6ee976bc0b5fb7e3d55734fcfa5c0e681105a Mon Sep 17 00:00:00 2001 From: dom4ha Date: Fri, 27 Sep 2024 15:05:47 +0000 Subject: [PATCH] Assert whethere there are no pod in active queue while waiting for all pods to get scheduled instead of asserting it afterwards. --- test/integration/scheduler/queue_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/scheduler/queue_test.go b/test/integration/scheduler/queue_test.go index 8b0f09f368e..4e5da499c1f 100644 --- a/test/integration/scheduler/queue_test.go +++ b/test/integration/scheduler/queue_test.go @@ -970,15 +970,16 @@ func TestCoreResourceEnqueue(t *testing.T) { } // Wait for the tt.pods to be still present in the scheduling (unschedulable) queue. if err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, wait.ForeverTestTimeout, false, func(ctx context.Context) (bool, error) { + activePodsCount := len(testCtx.Scheduler.SchedulingQueue.PodsInActiveQ()) + if activePodsCount > 0 { + return false, fmt.Errorf("Active queue was expected to be empty, but found %v Pods", activePodsCount) + } + pendingPods, _ := testCtx.Scheduler.SchedulingQueue.PendingPods() return len(pendingPods) == len(tt.pods), nil }); err != nil { t.Fatal(err) } - activePodsCount := len(testCtx.Scheduler.SchedulingQueue.PodsInActiveQ()) - if activePodsCount > 0 { - t.Fatalf("Active queue was expected to be empty, but found %v Pods", activePodsCount) - } t.Log("finished initial schedulings for all Pods, will trigger triggerFn")