kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73516 from mfojtik/fix-post-hook-test 

Wait for post-hooks to run before checking the healthz output

Kubernetes-commit: bc406490a5339160931b6661bd239ce977885df6
This commit is contained in:
Kubernetes Publisher 2019-02-01 16:01:57 -08:00
parent d04ee5ff38 15d93876c8
commit 9d07fe72a5
2 changed files with 210 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

404
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

8
pkg/server/config_test.go
View File

@ -56,7 +56,9 @@ func TestNewWithDelegate(t *testing.T) {
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
}) })
delegatePostStartHookChan := make(chan struct{})
delegateServer.AddPostStartHook("delegate-post-start-hook", func(context PostStartHookContext) error { delegateServer.AddPostStartHook("delegate-post-start-hook", func(context PostStartHookContext) error {
defer close(delegatePostStartHookChan)
return nil return nil
}) })
@ -82,7 +84,9 @@ func TestNewWithDelegate(t *testing.T) {
w.WriteHeader(http.StatusUnauthorized) w.WriteHeader(http.StatusUnauthorized)
}) })
wrappingPostStartHookChan := make(chan struct{})
wrappingServer.AddPostStartHook("wrapping-post-start-hook", func(context PostStartHookContext) error { wrappingServer.AddPostStartHook("wrapping-post-start-hook", func(context PostStartHookContext) error {
defer close(wrappingPostStartHookChan)
return nil return nil
}) })
@ -94,6 +98,10 @@ func TestNewWithDelegate(t *testing.T) {
server := httptest.NewServer(wrappingServer.Handler) server := httptest.NewServer(wrappingServer.Handler)
defer server.Close() defer server.Close()
// Wait for the hooks to finish before checking the response
<-delegatePostStartHookChan
<-wrappingPostStartHookChan
checkPath(server.URL, http.StatusOK, `{ checkPath(server.URL, http.StatusOK, `{
"paths": [ "paths": [
"/apis", "/apis",