djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #705 from mattmoyer/deflake-impersonation-websocket-test

Browse Source 
Make TestImpersonationProxy less flaky.
This commit is contained in:
Matt Moyer 2021-07-09 10:06:14 -07:00 committed by GitHub
commit 58363bca2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/integration/concierge_impersonation_proxy_test.go
View File

@ -1088,17 +1088,22 @@ func TestImpersonationProxy(t *testing.T) { //nolint:gocyclo // yeah, it's compl
return proxyURL, nil return proxyURL, nil
} }
} }
c, r, err := dialer.Dial(dest.String(), http.Header{"Origin": {dest.String()}}) var (
if r != nil { resp *http.Response
defer func() { conn *websocket.Conn
require.NoError(t, r.Body.Close()) )
}() testlib.RequireEventually(t, func(requireEventually *require.Assertions) {
} var err error
if err != nil && r != nil { conn, resp, err = dialer.Dial(dest.String(), http.Header{"Origin": {dest.String()}})
body, _ := ioutil.ReadAll(r.Body) if resp != nil {
t.Logf("websocket dial failed: %d:%s", r.StatusCode, body) defer func() { requireEventually.NoError(resp.Body.Close()) }()
} }
require.NoError(t, err) if err != nil && resp != nil {
body, _ := ioutil.ReadAll(resp.Body)
t.Logf("websocket dial failed: %d:%s", resp.StatusCode, body)
}
requireEventually.NoError(err)
}, time.Minute, time.Second)
// perform a create through the admin client // perform a create through the admin client
wantConfigMap := &corev1.ConfigMap{ wantConfigMap := &corev1.ConfigMap{
@ -1115,7 +1120,7 @@ func TestImpersonationProxy(t *testing.T) { //nolint:gocyclo // yeah, it's compl
}) })
// see if the websocket client received an event for the create // see if the websocket client received an event for the create
_, message, err := c.ReadMessage() _, message, err := conn.ReadMessage()
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }