github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23717 from mml/until

Browse Source 
Comment out racey part of the multi-scheduler test.
This commit is contained in:
Saad Ali
2016-04-05 11:34:32 -07:00
parent b8d000853e 6ace15eb73
commit 48fa998f58
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/scheduler_test.go
View File

@@ -417,6 +417,14 @@ func TestMultiScheduler(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Failed to delete pod: %v", err) 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) close(schedulerConfig.StopEverything)
// 8. create 2 pods: testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2 // 8. create 2 pods: testPodNoAnnotation2 and testPodWithAnnotationFitsDefault2
@@ -446,6 +454,7 @@ func TestMultiScheduler(t *testing.T) {
} else { } else {
t.Logf("Test MultiScheduler: %s Pod scheduled", testPodWithAnnotationFitsDefault2.Name) t.Logf("Test MultiScheduler: %s Pod scheduled", testPodWithAnnotationFitsDefault2.Name)
} }
*/
} }
func createPod(name string, annotation map[string]string) *api.Pod { func createPod(name string, annotation map[string]string) *api.Pod {