From 5ff5890ef974f4e51e2bdd9cec6914eb7b5d3886 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 31 Jan 2016 19:22:29 -0800 Subject: [PATCH] Remove e2e global 'timeout' --- test/e2e/cadvisor.go | 1 - test/e2e/nodeoutofdisk.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index 4cddade31ca..2553d7f31b7 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -27,7 +27,6 @@ import ( ) const ( - timeout = 1 * time.Minute maxRetries = 6 sleepDuration = 10 * time.Second ) diff --git a/test/e2e/nodeoutofdisk.go b/test/e2e/nodeoutofdisk.go index 592422fb433..3edf49edf8f 100644 --- a/test/e2e/nodeoutofdisk.go +++ b/test/e2e/nodeoutofdisk.go @@ -218,7 +218,7 @@ func availCpu(c *client.Client, node *api.Node) (int64, error) { func availSize(c *client.Client, node *api.Node) (uint64, error) { statsResource := fmt.Sprintf("api/v1/proxy/nodes/%s/stats/", node.Name) Logf("Querying stats for node %s using url %s", node.Name, statsResource) - res, err := c.Get().AbsPath(statsResource).Timeout(timeout).Do().Raw() + res, err := c.Get().AbsPath(statsResource).Timeout(time.Minute).Do().Raw() if err != nil { return 0, fmt.Errorf("error querying cAdvisor API: %v", err) }