From ce1925b82967df9a9eab41b0c7fa34284ec90389 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 24 Aug 2016 15:21:31 +0200 Subject: [PATCH] Don't set timeouts in clients in tests --- test/e2e/federation-authn.go | 5 ----- test/e2e/framework/util.go | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/test/e2e/federation-authn.go b/test/e2e/federation-authn.go index 99828d2136f..e8164ad525e 100644 --- a/test/e2e/federation-authn.go +++ b/test/e2e/federation-authn.go @@ -109,11 +109,6 @@ func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_relea if err != nil { return nil, fmt.Errorf("error creating federation clientset: %v", err) } - // Set timeout for each client in the set. - c.DiscoveryClient.Client.Timeout = framework.SingleCallTimeout - c.FederationClient.Client.Timeout = framework.SingleCallTimeout - c.CoreClient.Client.Timeout = framework.SingleCallTimeout - c.ExtensionsClient.Client.Timeout = framework.SingleCallTimeout return c, nil } diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index adc079141b3..71cdda581ca 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -1945,20 +1945,9 @@ func loadClientFromConfig(config *restclient.Config) (*client.Client, error) { if err != nil { return nil, fmt.Errorf("error creating client: %v", err.Error()) } - if c.Client.Timeout == 0 { - c.Client.Timeout = SingleCallTimeout - } return c, nil } -func setTimeouts(cs ...*http.Client) { - for _, client := range cs { - if client.Timeout == 0 { - client.Timeout = SingleCallTimeout - } - } -} - func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) { config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{}) if err != nil { @@ -1969,8 +1958,6 @@ func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) { if err != nil { return nil, fmt.Errorf("error creating federation clientset: %v", err.Error()) } - // Set timeout for each client in the set. - setTimeouts(c.DiscoveryClient.Client, c.FederationClient.Client, c.CoreClient.Client, c.ExtensionsClient.Client) return c, nil }