github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21071 from soltysh/server_close

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-23 06:34:27 -08:00
commit 7f1b699880
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/auth/authenticator/token/oidc/oidc_test.go
View File

@ -221,7 +221,8 @@ func TestOIDCDiscoveryNoKeyEndpoint(t *testing.T) {
t.Fatalf("Cannot load cert/key pair: %v", err) t.Fatalf("Cannot load cert/key pair: %v", err)
} }
srv.StartTLS() srv.StartTLS()
defer srv.Close() // TODO: Uncomment when fix #19254
// defer srv.Close()
op.pcfg = oidc.ProviderConfig{ op.pcfg = oidc.ProviderConfig{
Issuer: srv.URL, Issuer: srv.URL,
@ -277,7 +278,8 @@ func TestOIDCDiscoverySecureConnection(t *testing.T) {
t.Fatalf("Cannot load cert/key pair: %v", err) t.Fatalf("Cannot load cert/key pair: %v", err)
} }
tlsSrv.StartTLS() tlsSrv.StartTLS()
defer tlsSrv.Close() // TODO: Uncomment when fix #19254
// defer tlsSrv.Close()
op.pcfg = oidc.ProviderConfig{ op.pcfg = oidc.ProviderConfig{
Issuer: tlsSrv.URL, Issuer: tlsSrv.URL,