tests: Improve error messages on test failure.

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

diff --git a/tests/common.sh b/tests/common.sh
index 3b08d53da77e4d286b6d17438be64c7feb6d5599..8b93ce41b2f722fea6d1bd942b0b9b63b0fc780f 100644 (file)
--- 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
 }