more time and avoid nil panic (#2289)

Azure · Feb 16, 2018 · 3c3ef62 · 3c3ef62
1 parent 1d231c8
commit 3c3ef62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -328,7 +328,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Ensuring the service root URL returns the expected payload")
-				valid := s.Validate("(Welcome to nginx)", 5, 5*time.Second, cfg.Timeout)
+				valid := s.Validate("(Welcome to nginx)", 5, 30*time.Second, cfg.Timeout)
 				Expect(valid).To(BeTrue())
 
 				By("Ensuring we have outbound internet access from the nginx pods")

diff --git a/test/e2e/kubernetes/service/service.go b/test/e2e/kubernetes/service/service.go
@@ -153,7 +153,9 @@ func (s *Service) Validate(check string, attempts int, sleep, wait time.Duration
 		}
 		time.Sleep(sleep)
 	}
-	log.Printf("Unable to validate URL %s after %d attempts, err: %#v\n", url, i, err)
-	defer resp.Body.Close()
+	log.Printf("Unable to validate URL %s after %s, err: %#v\n", url, time.Duration(i)*wait, err)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
 	return false
 }