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

Merge pull request #127641 from dom4ha/integration-test-fix

Browse Source 
Increase the readability of the test preconditions and double check that all test pods are really unschedulable.
This commit is contained in:
Kubernetes Prow Robot 2024-09-27 17:20:01 +01:00 committed by GitHub
commit befeb009b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/scheduler/queue_test.go
View File

@ -954,22 +954,27 @@ func TestCoreResourceEnqueue(t *testing.T) {
} }
} }
// Wait for the tt.pods to be present in the scheduling queue. // Wait for the tt.pods to be present in the scheduling active queue.
if err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, wait.ForeverTestTimeout, false, func(ctx context.Context) (bool, error) { if err := wait.PollUntilContextTimeout(ctx, time.Millisecond*200, wait.ForeverTestTimeout, false, func(ctx context.Context) (bool, error) {
pendingPods, _ := testCtx.Scheduler.SchedulingQueue.PendingPods() pendingPods, _ := testCtx.Scheduler.SchedulingQueue.PendingPods()
return len(pendingPods) == len(tt.pods), nil return len(pendingPods) == len(tt.pods) && len(testCtx.Scheduler.SchedulingQueue.PodsInActiveQ()) == len(tt.pods), nil
}); err != nil { }); err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Log("Confirmed Pods in the scheduling queue, starting to schedule them") t.Log("Confirmed Pods in the scheduling queue, starting to schedule them")
// Pop all pods out. They should be unschedulable. // Pop all pods out. They should become unschedulable.
for i := 0; i < len(tt.pods); i++ { for i := 0; i < len(tt.pods); i++ {
testCtx.Scheduler.ScheduleOne(testCtx.Ctx) testCtx.Scheduler.ScheduleOne(testCtx.Ctx)
} }
// Wait for the tt.pods to be still present in the scheduling queue. // 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) { 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() pendingPods, _ := testCtx.Scheduler.SchedulingQueue.PendingPods()
return len(pendingPods) == len(tt.pods), nil return len(pendingPods) == len(tt.pods), nil
}); err != nil { }); err != nil {