diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 7fe35958e1a..262c1717fbe 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -282,8 +282,13 @@ func TestFailureHandler(t *testing.T) { queue := internalqueue.NewPriorityQueue(nil, informerFactory, internalqueue.WithClock(testingclock.NewFakeClock(time.Now()))) schedulerCache := internalcache.New(ctx, 30*time.Second) - queue.Add(logger, testPod) - queue.Pop(logger) + if err := queue.Add(logger, testPod); err != nil { + t.Fatalf("Add failed: %v", err) + } + + if _, err := queue.Pop(logger); err != nil { + t.Fatalf("Pop failed: %v", err) + } if tt.podUpdatedDuringScheduling { podInformer.Informer().GetStore().Update(testPodUpdated) diff --git a/pkg/scheduler/testing/framework/fake_extender.go b/pkg/scheduler/testing/framework/fake_extender.go index a0229d50302..e750d15ac4a 100644 --- a/pkg/scheduler/testing/framework/fake_extender.go +++ b/pkg/scheduler/testing/framework/fake_extender.go @@ -240,8 +240,8 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1 var potentialVictims []*v1.Pod - removePod := func(rp *v1.Pod) { - nodeInfoCopy.RemovePod(logger, rp) + removePod := func(rp *v1.Pod) error { + return nodeInfoCopy.RemovePod(logger, rp) } addPod := func(ap *v1.Pod) { nodeInfoCopy.AddPod(ap) @@ -252,7 +252,9 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1 for _, p := range nodeInfoCopy.Pods { if corev1helpers.PodPriority(p.Pod) < podPriority { potentialVictims = append(potentialVictims, p.Pod) - removePod(p.Pod) + if err := removePod(p.Pod); err != nil { + return nil, 0, false, err + } } } sort.Slice(potentialVictims, func(i, j int) bool { return util.MoreImportantPod(potentialVictims[i], potentialVictims[j]) }) @@ -279,7 +281,9 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1 addPod(p) status := f.runPredicate(pod, nodeInfoCopy.Node()) if !status.IsSuccess() { - removePod(p) + if err := removePod(p); err != nil { + return false + } victims = append(victims, p) } return status.IsSuccess()