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

Auto commit by PR queue bot

Merge pull request #14295 from ixdy/e2e-client-timeout
5b898127 · k8s-merge-robot · 8fda0969 · 11f37850 · 5b898127
Commit 5b898127 authored Sep 21, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

util.go test/e2e/util.go +3 -0

No files found.
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -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
 }