From 3407f290e07d17e850a1756aebee4354db83ce71 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 28 Jul 2013 13:21:07 +0200 Subject: [PATCH] tests: Improve error messages on test failure. --- tests/common.sh | 15 +++++++++------ tests/tests-normal.sh | 20 ++++++++++---------- tests/tests-passthrough.sh | 20 ++++++++++---------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index 3b08d53..8b93ce4 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -29,7 +29,7 @@ stop_servers() { pkill -n tlsproxy } abort() { - echo abort + echo "abort: $*" stop_servers exit 1 } @@ -41,17 +41,20 @@ client() { } test_proxy_failure() { - grep 'proxy failure' tmp >/dev/null || abort + grep 'proxy failure' tmp >/dev/null \ + || abort 'test_proxy_failure' grep 'response: HTTP/1.0 503 Forwarding failure' tmp >/dev/null \ - || abort + || abort 'test_proxy_failure 2' } test_proxy_successful() { grep 'response: HTTP/1.0 200 Connection established' tmp >/dev/null \ - || abort + || abort 'test_proxy_successful' } test_invalid_certificate() { - grep 'certificate invalid' tmp >/dev/null || abort + grep 'certificate invalid' tmp >/dev/null \ + || abort 'test_invalid_certificate' } test_no_invalid_certificate() { - grep 'certificate invalid' tmp >/dev/null && abort || true + grep 'certificate invalid' tmp >/dev/null \ + && abort 'test_no_invalid_certificate' || true } diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh index 44eda5b..b6d6c1d 100755 --- a/tests/tests-normal.sh +++ b/tests/tests-normal.sh @@ -34,12 +34,12 @@ sleep 1 echo invalid hostname -client unknown-host 80 - && abort +client unknown-host 80 - && abort 'client unknown-host 80 -' test_proxy_failure test_no_invalid_certificate echo missing proxy and server certificate -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' test_proxy_successful test_invalid_certificate @@ -49,21 +49,21 @@ test_invalid_certificate echo missing server certificate mv certificate-localhost-server.pem .pem -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-server.pem test_proxy_successful test_invalid_certificate echo missing proxy certificate mv certificate-localhost-proxy.pem .pem -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-proxy.pem test_proxy_successful test_invalid_certificate echo normal connection # 'localhost' is the CN of tlsproxy's certificate. -client localhost 4712 localhost || abort +client localhost 4712 localhost || abort 'client localhost 4712 localhost' test_proxy_successful test_no_invalid_certificate @@ -78,12 +78,12 @@ rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem echo mitm invalid hostname -client unknown-host 80 - && abort +client unknown-host 80 - && abort 'client unknown-host 80 -' test_proxy_failure test_no_invalid_certificate echo mitm missing proxy and server certificate -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' test_proxy_successful test_invalid_certificate @@ -93,20 +93,20 @@ test_invalid_certificate echo mitm missing server certificate mv certificate-localhost-server.pem .pem -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-server.pem test_proxy_successful test_invalid_certificate echo mitm missing proxy certificate mv certificate-localhost-proxy.pem .pem -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-proxy.pem test_proxy_successful test_invalid_certificate echo mitm normal connection -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' test_proxy_successful test_invalid_certificate diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh index fd0c378..5bac5bf 100755 --- a/tests/tests-passthrough.sh +++ b/tests/tests-passthrough.sh @@ -34,12 +34,12 @@ sleep 1 echo invalid hostname -client unknown-host 80 - && abort +client unknown-host 80 - && abort 'client unknown-host 80 -' test_proxy_failure test_no_invalid_certificate echo missing proxy and server certificate -client localhost 4712 'test server' || abort +client localhost 4712 'test server' || abort 'client localhost 4712 test server' test_proxy_successful test_invalid_certificate @@ -49,7 +49,7 @@ test_invalid_certificate echo missing server certificate mv certificate-localhost-server.pem .pem -client localhost 4712 'test server' || abort +client localhost 4712 'test server' || abort 'client localhost 4712 test server' mv .pem certificate-localhost-server.pem test_proxy_successful test_invalid_certificate @@ -58,14 +58,14 @@ echo missing proxy certificate mv certificate-localhost-proxy.pem .pem # "invalid" to prevent user error if the proxy certificate gets deleted (but # the server certificate is still readable). -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-proxy.pem test_proxy_successful test_invalid_certificate echo normal connection # 'localhost' is the CN of tlsproxy's certificate. -client localhost 4712 localhost || abort +client localhost 4712 localhost || abort 'client localhost 4712 localhost' test_proxy_successful test_no_invalid_certificate @@ -80,12 +80,12 @@ rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem echo mitm invalid hostname -client unknown-host 80 - && abort +client unknown-host 80 - && abort 'client unknown-host 80 -' test_proxy_failure test_no_invalid_certificate echo mitm missing proxy and server certificate -client localhost 4712 'test server bad' || abort +client localhost 4712 'test server bad' || abort 'client localhost 4712 test server bad' test_proxy_successful test_invalid_certificate @@ -95,7 +95,7 @@ test_invalid_certificate echo mitm missing server certificate mv certificate-localhost-server.pem .pem -client localhost 4712 'test server bad' || abort +client localhost 4712 'test server bad' || abort 'client localhost 4712 test server bad' mv .pem certificate-localhost-server.pem test_proxy_successful test_invalid_certificate @@ -104,13 +104,13 @@ echo mitm missing proxy certificate mv certificate-localhost-proxy.pem .pem # "invalid" to prevent user error if the proxy certificate gets deleted (but # the server certificate is still readable). -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' mv .pem certificate-localhost-proxy.pem test_proxy_successful test_invalid_certificate echo mitm normal connection -client localhost 4712 invalid || abort +client localhost 4712 invalid || abort 'client localhost 4712 invalid' test_proxy_successful test_invalid_certificate -- 2.43.2