From d8dd1c28d784687eb7041955d202592015b42bd4 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 21 Apr 2017 18:54:29 +0200 Subject: [PATCH] DVL-005 Intercept bad error codes during tests --- .tests/.lib.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.tests/.lib.sh b/.tests/.lib.sh index 332e0c44..26b110d1 100644 --- a/.tests/.lib.sh +++ b/.tests/.lib.sh @@ -440,7 +440,7 @@ debilbox_test() { print_h2 "4. Error output" echo "Curl" echo "------------------------------------------------------------" - curl localhost + curl -vv localhost || true echo echo "docker-compose ps" @@ -472,9 +472,9 @@ debilbox_test() { ### _test_docker_compose() { - _broken="$( docker-compose ps | grep -c 'Exit' )" - _running="$( docker-compose ps | grep -c 'Up' )" - _total="$( docker-compose ps -q | grep -c '' )" + _broken="$( docker-compose ps | grep -c 'Exit' || true )" + _running="$( docker-compose ps | grep -c 'Up' || true )" + _total="$( docker-compose ps -q | grep -c '' || true )" if [ "${_broken}" != "0" ]; then return 1 @@ -494,7 +494,7 @@ _test_docker_compose() { _test_curled_oks() { _oks="${1}" - _count="$( curl -q localhost 2>/dev/null | grep -c OK )" + _count="$( curl -q localhost 2>/dev/null | grep -c 'OK' || true )" echo "${_count}" if [ "${_count}" != "${_oks}" ]; then