From f51071814e57dc0fd118c8dc961fd6971b09db76 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 18 Dec 2017 21:52:12 +0100 Subject: [PATCH] Change ct_test_response so it does not print too verbose output --- test-lib.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/test-lib.sh b/test-lib.sh index f002d3f0..dd90fed9 100644 --- a/test-lib.sh +++ b/test-lib.sh @@ -314,20 +314,22 @@ ct_test_response() { local attempt=1 local result=1 local status - while [ $attempt -le $max_attempts ]; do - response=$(curl --connect-timeout 10 -s -w '%{http_code}' "${url}") && status=0 || status=1 - if [ $status -eq 0 ]; then - response_code=$(printf '%s' "$response" | tail -c 3) - response_body=$(printf '%s' "$response" | head -c -3) - if [ "$response_code" -eq "$expected_code" ]; then + local response_code + local response_file=$(mktemp /tmp/ct_test_response_XXXXXX) + while [ ${attempt} -le ${max_attempts} ]; do + curl --connect-timeout 10 -s -w '%{http_code}' "${url}" >${response_file} && status=0 || status=1 + if [ ${status} -eq 0 ]; then + response_code=$(cat ${response_file} | tail -c 3) + if [ "${response_code}" -eq "${expected_code}" ]; then result=0 fi - printf '%s' "$response_body" | grep -qP -e "$body_regexp" || result=1; + cat ${response_file} | grep -qP -e "${body_regexp}" || result=1; break fi - attempt=$(( $attempt + 1 )) - sleep $sleep_time + attempt=$(( ${attempt} + 1 )) + sleep ${sleep_time} done - return $result + rm -f ${response_file} + return ${result} }