diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 656811bb5cc..fd921c72471 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -188,11 +188,6 @@ func TestMultipleSchedulers(t *testing.T) { // 5. create a scheduler with name "foo-scheduler" // 6. **check point-2**: // - testPodWithAnnotationFitsFoo should be scheduled - // 7. stop default scheduler - // 8. create 2 pods: testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 - // - note: these two pods belong to default scheduler which no longer exists - // 9. **check point-3**: - // - testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 should NOT be scheduled // 1. create and start default-scheduler testCtx := initTest(t, "multi-scheduler") @@ -279,52 +274,6 @@ func TestMultipleSchedulers(t *testing.T) { } else { t.Logf("Test MultiScheduler: %s Pod scheduled", testPodFitsFoo.Name) } - - // 7. delete the pods that were scheduled by the default scheduler, and stop the default scheduler - if err := deletePod(testCtx.ClientSet, testPod.Name, testCtx.NS.Name); err != nil { - t.Errorf("Failed to delete pod: %v", err) - } - if err := deletePod(testCtx.ClientSet, testPodFitsDefault.Name, testCtx.NS.Name); err != nil { - t.Errorf("Failed to delete pod: %v", err) - } - - // The rest of this test assumes that closing StopEverything will cause the - // scheduler thread to stop immediately. It won't, and in fact it will often - // schedule 1 more pod before finally exiting. Comment out until we fix that. - // - // See https://github.com/kubernetes/kubernetes/issues/23715 for more details. - - /* - close(schedulerConfig.StopEverything) - - // 8. create 2 pods: testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 - // - note: these two pods belong to default scheduler which no longer exists - podWithNoAnnotation2 := createPod("pod-with-no-annotation2", nil) - podWithAnnotationFitsDefault2 := createPod("pod-with-annotation-fits-default2", schedulerAnnotationFitsDefault) - testPodNoAnnotation2, err := clientSet.CoreV1().Pods(ns.Name).Create(podWithNoAnnotation2) - if err != nil { - t.Fatalf("Failed to create pod: %v", err) - } - testPodWithAnnotationFitsDefault2, err := clientSet.CoreV1().Pods(ns.Name).Create(podWithAnnotationFitsDefault2) - if err != nil { - t.Fatalf("Failed to create pod: %v", err) - } - - // 9. **check point-3**: - // - testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 should NOT be scheduled - err = wait.Poll(time.Second, time.Second*5, testutils.PodScheduled(clientSet, testPodNoAnnotation2.Namespace, testPodNoAnnotation2.Name)) - if err == nil { - t.Errorf("Test MultiScheduler: %s Pod got scheduled, %v", testPodNoAnnotation2.Name, err) - } else { - t.Logf("Test MultiScheduler: %s Pod not scheduled", testPodNoAnnotation2.Name) - } - err = wait.Poll(time.Second, time.Second*5, testutils.PodScheduled(clientSet, testPodWithAnnotationFitsDefault2.Namespace, testPodWithAnnotationFitsDefault2.Name)) - if err == nil { - t.Errorf("Test MultiScheduler: %s Pod got scheduled, %v", testPodWithAnnotationFitsDefault2.Name, err) - } else { - t.Logf("Test MultiScheduler: %s Pod scheduled", testPodWithAnnotationFitsDefault2.Name) - } - */ } func TestMultipleSchedulingProfiles(t *testing.T) {