From df5faeb5af0bcfa7c06fb8191399b5d8d73d2efe Mon Sep 17 00:00:00 2001 From: Prashanth B Date: Fri, 1 Jan 2016 12:41:27 +0000 Subject: [PATCH] Switch DefaultClient with a timeoutClient in Ingress e2e. --- test/e2e/ingress.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 2611786c0a3..d9f0037823e 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -94,6 +94,10 @@ var ( // GCE only allows names < 64 characters, and the loadbalancer controller inserts // a single character of padding. nameLenLimit = 62 + + // Timing out requests will lead to retries, and more importantly, the test + // finishing in a deterministic manner. + timeoutClient = &http.Client{Timeout: 60 * time.Second} ) // timeSlice allows sorting of time.Duration @@ -521,7 +525,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller [Serial] [Slow] [Flaky]", func( var lastBody string pollErr := wait.Poll(lbPollInterval, lbPollTimeout, func() (bool, error) { var err error - lastBody, err = simpleGET(http.DefaultClient, route, rules.Host) + lastBody, err = simpleGET(timeoutClient, route, rules.Host) if err != nil { Logf("host %v path %v: %v", rules.Host, route, err) return false, nil @@ -569,7 +573,7 @@ func curlServiceNodePort(client *client.Client, ns, name string, port int) error if err != nil { return err } - svcCurlBody, err := simpleGET(http.DefaultClient, u, "") + svcCurlBody, err := simpleGET(timeoutClient, u, "") if err != nil { return fmt.Errorf("Failed to curl service node port, body: %v\nerror %v", svcCurlBody, err) }