diff --git a/ca/tls_test.go b/ca/tls_test.go index 5513e06d..ac1d84b6 100644 --- a/ca/tls_test.go +++ b/ca/tls_test.go @@ -181,13 +181,8 @@ func TestClient_GetServerTLSConfig_http(t *testing.T) { t.Errorf("Client.GetClientTLSConfig() error = %v", err) return nil } - tr, err := getDefaultTransport(tlsConfig) - if err != nil { - t.Errorf("getDefaultTransport() error = %v", err) - return nil - } return &http.Client{ - Transport: tr, + Transport: getDefaultTransport(tlsConfig), } }, map[string]bool{srvTLS.URL: false, srvMTLS.URL: false}}, {"with no ClientCert", func(t *testing.T, client *Client, sr *api.SignResponse, pk crypto.PrivateKey) *http.Client { @@ -199,14 +194,8 @@ func TestClient_GetServerTLSConfig_http(t *testing.T) { tlsConfig := getDefaultTLSConfig(sr) tlsConfig.RootCAs = x509.NewCertPool() tlsConfig.RootCAs.AddCert(root) - - tr, err := getDefaultTransport(tlsConfig) - if err != nil { - t.Errorf("getDefaultTransport() error = %v", err) - return nil - } return &http.Client{ - Transport: tr, + Transport: getDefaultTransport(tlsConfig), } }, map[string]bool{srvTLS.URL + "/no-cert": false, srvMTLS.URL + "/no-cert": true}}, {"fail with default", func(t *testing.T, client *Client, sr *api.SignResponse, pk crypto.PrivateKey) *http.Client { @@ -288,10 +277,7 @@ func TestClient_GetServerTLSConfig_renew(t *testing.T) { if err != nil { t.Fatalf("Client.GetClientTLSConfig() error = %v", err) } - tr2, err := getDefaultTransport(tlsConfig) - if err != nil { - t.Fatalf("getDefaultTransport() error = %v", err) - } + tr2 := getDefaultTransport(tlsConfig) // No client cert root, err := RootCertificate(sr) if err != nil { @@ -300,10 +286,7 @@ func TestClient_GetServerTLSConfig_renew(t *testing.T) { tlsConfig = getDefaultTLSConfig(sr) tlsConfig.RootCAs = x509.NewCertPool() tlsConfig.RootCAs.AddCert(root) - tr3, err := getDefaultTransport(tlsConfig) - if err != nil { - t.Fatalf("getDefaultTransport() error = %v", err) - } + tr3 := getDefaultTransport(tlsConfig) // Disable keep alives to force TLS handshake tr1.DisableKeepAlives = true