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

Merge pull request #24818 from deads2k/deflake-quota-int

Browse Source 
Automatic merge from submit-queue

deflake quota master init order

fixes https://github.com/kubernetes/kubernetes/issues/24816

blocks serving until the Handler is available

@smarterclayton
This commit is contained in:
k8s-merge-robot 2016-04-26 15:55:53 -07:00
commit 3b09c64161
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/quota_test.go
View File

@ -52,9 +52,11 @@ import (
func TestQuota(t *testing.T) { func TestQuota(t *testing.T) {
framework.DeleteAllEtcdKeys() framework.DeleteAllEtcdKeys()
initializationCh := make(chan struct{})
// Set up a master // Set up a master
var m *master.Master var m *master.Master
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
<-initializationCh
m.Handler.ServeHTTP(w, req) m.Handler.ServeHTTP(w, req)
})) }))
// TODO: Uncomment when fix #19254 // TODO: Uncomment when fix #19254
@ -71,6 +73,7 @@ func TestQuota(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Error in bringing up the master: %v", err) t.Fatalf("Error in bringing up the master: %v", err)
} }
close(initializationCh)
go replicationcontroller.NewReplicationManagerFromClient(clientset, controller.NoResyncPeriodFunc, replicationcontroller.BurstReplicas, 4096). go replicationcontroller.NewReplicationManagerFromClient(clientset, controller.NoResyncPeriodFunc, replicationcontroller.BurstReplicas, 4096).
Run(3, wait.NeverStop) Run(3, wait.NeverStop)