tests: Improve error messages on test failure.

[tlsproxy/tlsproxy.git] / tests / common.sh

diff --git a/tests/common.sh b/tests/common.sh
index 52b0f74bfa740318646e5fda571ab2994fb37b0c..8b93ce41b2f722fea6d1bd942b0b9b63b0fc780f 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -24,10 +24,13 @@ cleanup() {
         certificate-localhost-proxy.pem certificate-localhost-server.pem \
         proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
 }
-abort() {
-    echo abort
+stop_servers() {
     pkill -n gnutls-serv
     pkill -n tlsproxy
+}
+abort() {
+    echo "abort: $*"
+    stop_servers
     exit 1
 }
 server() {
@@ -38,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
 }