github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31346 from wojtek-t/dont_set_timeout_in_tests

Browse Source 
Automatic merge from submit-queue

Don't set timeouts in clients in tests

We are not setting timeouts in production - we shouldn't do it in tests then...

Addresses point 2. of #31345
This commit is contained in:
Kubernetes Submit Queue 2016-10-07 05:51:45 -07:00 committed by GitHub
commit 5d3321ef83
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/federation-authn.go
View File

@ -109,11 +109,6 @@ func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_relea
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating federation clientset: %v", err) 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 return c, nil
} }

13
test/e2e/framework/util.go
View File

@ -1945,20 +1945,9 @@ func loadClientFromConfig(config *restclient.Config) (*client.Client, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating client: %v", err.Error()) return nil, fmt.Errorf("error creating client: %v", err.Error())
} }
if c.Client.Timeout == 0 {
c.Client.Timeout = SingleCallTimeout
}
return c, nil 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) { func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) {
config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{}) config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{})
if err != nil { if err != nil {
@ -1969,8 +1958,6 @@ func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating federation clientset: %v", err.Error()) 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 return c, nil
} }