Merge pull request #3684 from smreed/services-e2e-fix

Fixes endpoint propagation failure in services e2e
This commit is contained in:
Brian Grant 2015-01-21 10:37:26 -08:00
commit fc1e3854af

View File

@ -212,6 +212,7 @@ function wait_for_service_up() {
set -e; set -e;
for i in $(seq -s' ' 1 $4); do for i in $(seq -s' ' 1 $4); do
curl -s --connect-timeout 1 http://$2:$3; curl -s --connect-timeout 1 http://$2:$3;
echo;
done | sort | uniq done | sort | uniq
")) "))
@ -258,7 +259,8 @@ function verify_from_container() {
ok=false ok=false
for j in $(seq -s' ' 1 10); do for j in $(seq -s' ' 1 10); do
if wget -q -T 1 -O - http://$2:$3; then if wget -q -T 1 -O - http://$2:$3; then
ok=true echo
ok=true
break break
fi fi
sleep 1 sleep 1