github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix TestMaxInFlight

pull/6/head
Wojciech Tyczynski 2015-10-01 14:28:22 +02:00
parent 8356270cce
commit a659007f6a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apiserver/handlers_test.go
View File

@ -62,6 +62,9 @@ func TestMaxInFlight(t *testing.T) {
const Iterations = 3 const Iterations = 3
block := sync.WaitGroup{} block := sync.WaitGroup{}
block.Add(1) block.Add(1)
oneFinished := sync.WaitGroup{}
oneFinished.Add(1)
var once sync.Once
sem := make(chan bool, Iterations) sem := make(chan bool, Iterations)
re := regexp.MustCompile("[.*\\/watch][^\\/proxy.*]") re := regexp.MustCompile("[.*\\/watch][^\\/proxy.*]")
@ -86,6 +89,7 @@ func TestMaxInFlight(t *testing.T) {
// These should hang waiting on block... // These should hang waiting on block...
go func() { go func() {
expectHTTP(server.URL+"/foo/bar/watch", http.StatusOK, t) expectHTTP(server.URL+"/foo/bar/watch", http.StatusOK, t)
once.Do(oneFinished.Done)
}() }()
} }
@ -93,6 +97,7 @@ func TestMaxInFlight(t *testing.T) {
// These should hang waiting on block... // These should hang waiting on block...
go func() { go func() {
expectHTTP(server.URL+"/proxy/foo/bar", http.StatusOK, t) expectHTTP(server.URL+"/proxy/foo/bar", http.StatusOK, t)
once.Do(oneFinished.Done)
}() }()
} }
expectHTTP(server.URL+"/dontwait", http.StatusOK, t) expectHTTP(server.URL+"/dontwait", http.StatusOK, t)
@ -101,6 +106,7 @@ func TestMaxInFlight(t *testing.T) {
// These should hang waiting on block... // These should hang waiting on block...
go func() { go func() {
expectHTTP(server.URL, http.StatusOK, t) expectHTTP(server.URL, http.StatusOK, t)
once.Do(oneFinished.Done)
}() }()
} }
calls.Wait() calls.Wait()
@ -117,6 +123,8 @@ func TestMaxInFlight(t *testing.T) {
block.Done() block.Done()
// Show that we recover from being blocked up. // Show that we recover from being blocked up.
// However, we should until at least one of the requests really finishes.
oneFinished.Wait()
expectHTTP(server.URL, http.StatusOK, t) expectHTTP(server.URL, http.StatusOK, t)
} }