Increase integration test timeouts (#2360)

The integration tests occasionally timeout in ci when talking to Kubernetes and Linkerd: https://travis-ci.org/linkerd/linkerd2/jobs/497300669#L972 https://travis-ci.org/linkerd/linkerd2/jobs/497329339#L7284 Increase `linkerd check --wait` from `0` to `30s`. Increase `HTTPGetURL` timeout from 30s to 1 minute. Signed-off-by: Andrew Seigner <siggy@buoyant.io>
linkerd · Feb 23, 2019 · e300309 · e300309
1 parent 7fa7e96
commit e300309
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,9 +26,9 @@ jobs:
       go_import_path: github.com/linkerd/linkerd2
       cache:
         directories:
-          - $HOME/.cache/go-build
           - target
           - vendor
+          - "$HOME/.cache"
       install:
         - ./bin/dep ensure -vendor-only -v
         - ./bin/dep status -v

diff --git a/test/install_test.go b/test/install_test.go
@@ -131,7 +131,7 @@ func TestVersionPostInstall(t *testing.T) {
 }
 
 func TestCheckPostInstall(t *testing.T) {
-	cmd := []string{"check", "--expected-version", TestHelper.GetVersion(), "--wait=0"}
+	cmd := []string{"check", "--expected-version", TestHelper.GetVersion(), "--wait=1m"}
 	golden := "check.golden"
 	if TestHelper.SingleNamespace() {
 		cmd = append(cmd, "--single-namespace")
@@ -229,7 +229,7 @@ func TestInject(t *testing.T) {
 
 func TestCheckProxy(t *testing.T) {
 	prefixedNs := TestHelper.GetTestNamespace("smoke-test")
-	cmd := []string{"check", "--proxy", "--expected-version", TestHelper.GetVersion(), "--namespace", prefixedNs, "--wait=0"}
+	cmd := []string{"check", "--proxy", "--expected-version", TestHelper.GetVersion(), "--namespace", prefixedNs, "--wait=1m"}
 	golden := "check.proxy.golden"
 	if TestHelper.SingleNamespace() {
 		cmd = append(cmd, "--single-namespace")

diff --git a/testutil/test_helper.go b/testutil/test_helper.go
@@ -237,7 +237,7 @@ func (h *TestHelper) RetryFor(timeout time.Duration, fn func() error) error {
 // giving pods time to start.
 func (h *TestHelper) HTTPGetURL(url string) (string, error) {
 	var body string
-	err := h.RetryFor(30*time.Second, func() error {
+	err := h.RetryFor(time.Minute, func() error {
 		resp, err := h.httpClient.Get(url)
 		if err != nil {
 			return err