From e3f7899be2da0485ce761d58beb0ce8075241262 Mon Sep 17 00:00:00 2001 From: Steve Reed Date: Wed, 21 Jan 2015 08:40:33 -0800 Subject: [PATCH 1/2] Extra echo in services.sh e2e test to get it to pass --- hack/e2e-suite/services.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh index 88c7c4767fe..011df65fb04 100755 --- a/hack/e2e-suite/services.sh +++ b/hack/e2e-suite/services.sh @@ -206,6 +206,7 @@ function wait_for_service_up() { set -e; for i in $(seq -s' ' 1 $4); do curl -s --connect-timeout 1 http://$2:$3; + echo done | sort | uniq ")) @@ -252,7 +253,8 @@ function verify_from_container() { ok=false for j in $(seq -s' ' 1 10); do if wget -q -T 1 -O - http://$2:$3; then - ok=true + echo + ok=true break fi sleep 1 From 0d79cfc581c8d369361a6af0450ec0128ab1630b Mon Sep 17 00:00:00 2001 From: Steve Reed Date: Wed, 21 Jan 2015 10:30:58 -0800 Subject: [PATCH 2/2] Adds trailing semi-colon as per PR comment --- hack/e2e-suite/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh index 011df65fb04..9572a99a3da 100755 --- a/hack/e2e-suite/services.sh +++ b/hack/e2e-suite/services.sh @@ -206,7 +206,7 @@ function wait_for_service_up() { set -e; for i in $(seq -s' ' 1 $4); do curl -s --connect-timeout 1 http://$2:$3; - echo + echo; done | sort | uniq "))