Merge pull request #19253 from gmarek/master

Auto commit by PR queue bot

Merge pull request #19253 from gmarek/master
f2b898a8 · k8s-merge-robot · f45f00cc · 79b6f13b · f2b898a8
Commit f2b898a8 authored Jan 05, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

test-cmd.sh hack/test-cmd.sh +4 -2

No files found.
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -54,10 +54,12 @@ function start-proxy()
  done

  PROXY_PID=$!
+  # We try checking kubectl proxy 30 times with 1s delays to avoid occasional
+  # failures.
  if [ $# -eq 0 ]; then
-    kube::util::wait_for_url "http://127.0.0.1:${PROXY_PORT}/healthz" "kubectl proxy"
+    kube::util::wait_for_url "http://127.0.0.1:${PROXY_PORT}/healthz" "kubectl proxy" 1 30
  else
-    kube::util::wait_for_url "http://127.0.0.1:${PROXY_PORT}/$1/healthz" "kubectl proxy --api-prefix=$1"
+    kube::util::wait_for_url "http://127.0.0.1:${PROXY_PORT}/$1/healthz" "kubectl proxy --api-prefix=$1" 1 30
  fi
 }