From 9cb7bc2e904e495e0eb1761b73efd2b516036fa6 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Thu, 9 Jul 2015 09:46:10 +0200
Subject: [PATCH] Fix Shell services test

---
 hack/e2e-suite/services.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh
index f0a6bf43106..23372dae510 100755
--- a/hack/e2e-suite/services.sh
+++ b/hack/e2e-suite/services.sh
@@ -233,12 +233,12 @@ function wait_for_service_up() {
     results=($(ssh-to-node "${test_node}" "
         set -e;
         for i in $(seq -s' ' 1 $(($4*3))); do
-          curl -s --connect-timeout 1 http://$2:$3;
+          wget -q -T 1 -O - http://$2:$3 || true;
           echo;
         done | sort -n | uniq
         "))
 
-    found_pods=$(sort_args "${results[@]}")
+    found_pods=$(sort_args "${results[@]:+${results[@]}}")
     if [[ "${found_pods}" == "$5" ]]; then
       return
     fi
@@ -280,12 +280,12 @@ function verify_from_container() {
         sudo docker pull gcr.io/google_containers/busybox >/dev/null;
         sudo docker run gcr.io/google_containers/busybox sh -c '
             for i in $(seq -s' ' 1 $(($4*3))); do
-              wget -q -T 1 -O - http://$2:$3;
+              wget -q -T 1 -O - http://$2:$3 || true;
               echo;
             done
         '" | sort -n | uniq))
 
-    found_pods=$(sort_args "${results[@]}")
+    found_pods=$(sort_args "${results[@]:+${results[@]}}")
     if [[ "${found_pods}" == "$5" ]]; then
       return
     fi