github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17640 from wojtek-t/fix_max_in_fligh_test

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-23 07:30:42 -08:00
commit 7b814a5122
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/apiserver/handlers_test.go
View File

@ -61,8 +61,8 @@ func TestMaxInFlight(t *testing.T) {
const Iterations = 3
block := sync.WaitGroup{}
block.Add(1)
oneFinished := sync.WaitGroup{}
oneFinished.Add(1)
oneAccountedFinished := sync.WaitGroup{}
oneAccountedFinished.Add(1)
var once sync.Once
sem := make(chan bool, Iterations)
@ -88,15 +88,14 @@ func TestMaxInFlight(t *testing.T) {
// These should hang waiting on block...
go func() {
expectHTTP(server.URL+"/foo/bar/watch", http.StatusOK, t)
once.Do(oneFinished.Done)
}()
}
// These should hang, but not affect accounting.
for i := 0; i < Iterations; i++ {
// These should hang waiting on block...
go func() {
expectHTTP(server.URL+"/proxy/foo/bar", http.StatusOK, t)
once.Do(oneFinished.Done)
}()
}
expectHTTP(server.URL+"/dontwait", http.StatusOK, t)
@ -105,7 +104,7 @@ func TestMaxInFlight(t *testing.T) {
// These should hang waiting on block...
go func() {
expectHTTP(server.URL, http.StatusOK, t)
once.Do(oneFinished.Done)
once.Do(oneAccountedFinished.Done)
}()
}
calls.Wait()
@ -123,7 +122,7 @@ func TestMaxInFlight(t *testing.T) {
// Show that we recover from being blocked up.
// However, we should until at least one of the requests really finishes.
oneFinished.Wait()
oneAccountedFinished.Wait()
expectHTTP(server.URL, http.StatusOK, t)
}