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

Switch DefaultClient with a timeoutClient in Ingress e2e.

Browse Source
This commit is contained in:
Prashanth B 2016-01-01 12:41:27 +00:00
parent 92463a2435
commit df5faeb5af
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/ingress.go
View File

@ -94,6 +94,10 @@ var (
// GCE only allows names < 64 characters, and the loadbalancer controller inserts // GCE only allows names < 64 characters, and the loadbalancer controller inserts
// a single character of padding. // a single character of padding.
nameLenLimit = 62 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 // timeSlice allows sorting of time.Duration
@ -521,7 +525,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller [Serial] [Slow] [Flaky]", func(
var lastBody string var lastBody string
pollErr := wait.Poll(lbPollInterval, lbPollTimeout, func() (bool, error) { pollErr := wait.Poll(lbPollInterval, lbPollTimeout, func() (bool, error) {
var err error var err error
lastBody, err = simpleGET(http.DefaultClient, route, rules.Host) lastBody, err = simpleGET(timeoutClient, route, rules.Host)
if err != nil { if err != nil {
Logf("host %v path %v: %v", rules.Host, route, err) Logf("host %v path %v: %v", rules.Host, route, err)
return false, nil return false, nil
@ -569,7 +573,7 @@ func curlServiceNodePort(client *client.Client, ns, name string, port int) error
if err != nil { if err != nil {
return err return err
} }
svcCurlBody, err := simpleGET(http.DefaultClient, u, "") svcCurlBody, err := simpleGET(timeoutClient, u, "")
if err != nil { if err != nil {
return fmt.Errorf("Failed to curl service node port, body: %v\nerror %v", svcCurlBody, err) return fmt.Errorf("Failed to curl service node port, body: %v\nerror %v", svcCurlBody, err)
} }