From 2766272fffb5046b506b08e1766c9cb39130b091 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 23 Nov 2015 10:54:57 +0100 Subject: [PATCH] Fix MaxInFlight test --- pkg/apiserver/handlers_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/apiserver/handlers_test.go b/pkg/apiserver/handlers_test.go index 112692c6bf9..05c6d8ac3ca 100644 --- a/pkg/apiserver/handlers_test.go +++ b/pkg/apiserver/handlers_test.go @@ -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) }