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

Merge pull request #707 from mattmoyer/fix-okta-cli-integration-test 

Fix TestCLILoginOIDC when running against Okta, and lower CLI server shutdown timeout.
This commit is contained in:
Matt Moyer 2021-07-09 14:30:19 -07:00 committed by GitHub
parent 405a27ba90 5527566a36
commit c71703e4db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/oidcclient/login.go
View File

@ -850,9 +850,9 @@ func (h *handlerState) serve(listener net.Listener) func() {
}
go func() { _ = srv.Serve(listener) }()
return func() {
// Gracefully shut down the server, allowing up to 5 seconds for
// Gracefully shut down the server, allowing up to 5 00ms for
// clients to receive any in-flight responses.
shutdownCtx, cancel := context.WithTimeout(h.ctx, 5*time.Second)
shutdownCtx, cancel := context.WithTimeout(h.ctx, 500*time.Millisecond)
_ = srv.Shutdown(shutdownCtx)
cancel()
}

2
test/integration/cli_test.go
View File

@ -355,7 +355,7 @@ func runPinnipedLoginOIDC(
// Expect to be redirected to the localhost callback.
t.Logf("waiting for redirect to callback")
callbackURLPattern := regexp.MustCompile(`\A` + regexp.QuoteMeta(env.CLIUpstreamOIDC.CallbackURL) + `\?.+\z`)
callbackURLPattern := regexp.MustCompile(`\A` + regexp.QuoteMeta(env.CLIUpstreamOIDC.CallbackURL) + `(\?.+)?\z`)
browsertest.WaitForURL(t, page, callbackURLPattern)
// Wait for the "pre" element that gets rendered for a `text/plain` page, and