From fcf254591f2ef8d9ba389e86e554fc77a91dc654 Mon Sep 17 00:00:00 2001
From: Jay Vyas <jay@apache.org>
Date: Sat, 23 Apr 2016 00:43:59 -0400
Subject: [PATCH] Slow down redis pod polling, ensure no flakiness in kubectl
 service test.

---
 test/e2e/kubectl.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go
index 8dfb6911951..18f7ac1354d 100644
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -727,8 +727,12 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 
 			framework.Logf("namespace %v", ns)
 			framework.RunKubectlOrDie("create", "-f", controllerJson, nsFlag)
+
+			// It may take a while for the pods to get registered in some cases, wait to be sure.
+			By("Waiting for Redis master to start.")
+			waitFor(1)
 			forEachPod(func(pod api.Pod) {
-				framework.Logf("wait on %v ", ns)
+				framework.Logf("wait on redis-master startup in %v ", ns)
 				framework.LookForStringInLog(ns, pod.Name, "redis-master", "The server is now ready to accept connections", framework.PodStartTimeout)
 			})
 			validateService := func(name string, servicePort int, timeout time.Duration) {