diff --git a/.travis.yml b/.travis.yml index bf99d8b0..058bfdfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,24 +3,11 @@ dist: xenial env: - DOCKER_COMPOSE_VERSION: 1.23.1 -addons: - apt: - packages: - - build-essential - - nghttp2 - - libnghttp2-dev - - libssl-dev services: - docker before_install: - - wget https://curl.haxx.se/download/curl-7.63.0.tar.gz && tar xzf curl-7.63.0.tar.gz - - cd curl-7.63.0 - - sudo apt-get -y remove curl - - ./configure --with-nghttp2 --with-ssl - - make && sudo make install - - sudo ldconfig && cd .. - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update diff --git a/test.sh b/test.sh index 7f021109..c0f5e673 100644 --- a/test.sh +++ b/test.sh @@ -2,5 +2,13 @@ ./dbench start > /tmp/bench.log & -curl --version -curl --retry 20 --retry-delay 1 --retry-connrefused "http://localhost:8000/login" | grep ' Login ' || exit 1 \ No newline at end of file +output=$( + while ! curl "http://localhost:8000/login" + do + { echo "Exit status of curl: $?" + } 1>&2 + sleep 1 + done +) + +echo "${output}" | grep ' Login ' || exit 1 \ No newline at end of file