bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: fix bug #80: keep track of errors in return codes

Browse Source 
Michael
This commit is contained in:
Michael Adam 2010-02-23 00:18:29 +01:00
parent 7c15563430
commit 3f1632603c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/scripts/run_tests.sh
View File

@ -163,8 +163,9 @@ run_basic_webclient_request() {
echo "webclient output:" echo "webclient output:"
cat $WEBCLIENT_LOG cat $WEBCLIENT_LOG
fi fi
}
return $WEBCLIENT_EXIT_CODE
}
# "main" # "main"
@ -177,14 +178,21 @@ start_tinyproxy
wait_for_some_seconds 3 wait_for_some_seconds 3
FAILED=0
echo -n "checking direct connection to web server..." echo -n "checking direct connection to web server..."
run_basic_webclient_request "$WEBSERVER_IP:$WEBSERVER_PORT" / run_basic_webclient_request "$WEBSERVER_IP:$WEBSERVER_PORT" /
test "x$?" = "x0" || FAILED=$((FAILED + 1))
echo -n "testing connection through tinyproxy..." echo -n "testing connection through tinyproxy..."
run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$WEBSERVER_IP:$WEBSERVER_PORT/" run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$WEBSERVER_IP:$WEBSERVER_PORT/"
test "x$?" = "x0" || FAILED=$((FAILED + 1))
echo -n "requesting statspage via stathost url..." echo -n "requesting statspage via stathost url..."
run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$TINYPROXY_STATHOST_IP" run_basic_webclient_request "$TINYPROXY_IP:$TINYPROXY_PORT" "http://$TINYPROXY_STATHOST_IP"
test "x$?" = "x0" || FAILED=$((FAILED + 1))
echo "$FAILED errors"
if test "x$TINYPROXY_TESTS_WAIT" = "xyes"; then if test "x$TINYPROXY_TESTS_WAIT" = "xyes"; then
echo "You can continue using the webserver and tinyproxy." echo "You can continue using the webserver and tinyproxy."
@ -197,4 +205,4 @@ stop_webserver
echo "done" echo "done"
exit 0 exit $FAILED