github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 05:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14295 from ixdy/e2e-client-timeout

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-21 14:49:50 -07:00
parent 8fda0969e6 11f3785023
commit 5b898127d8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/util.go
View File

@@ -834,6 +834,9 @@ func loadClient() (*client.Client, error) {
if err != nil {
return nil, fmt.Errorf("error creating client: %v", err.Error())
}
if c.Timeout == 0 {
c.Timeout = singleCallTimeout
}
return c, nil
}