tests/common.sh: Log output of tlsproxy to tlsproxy-log.

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

diff --git a/tests/common.sh b/tests/common.sh
index 05641db98ad8482141a03acc9f87ae64eef64f33..1ca15837a47bdc5864db80e59f7de479f437a41c 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,6 +1,6 @@
 # Functions used by all tests.
 #
-# Copyright (C) 2011  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,31 +16,51 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
+
+cleanup() {
+    rm -f \
+        tmp tlsproxy-log \
+        certificate-localhost-proxy.pem certificate-localhost-server.pem \
+        proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+}
+stop_servers() {
+    kill $pid_server || echo 'failed to kill gnutls-serv'
+    kill $pid_tlsproxy || echo 'failed to kill tlsproxy'
+}
 abort() {
-    echo abort
-    pkill -n gnutls-serv
-    pkill -n tlsproxy
+    echo "abort: $*"
+    stop_servers
     exit 1
 }
+tlsproxy() {
+    ../src/tlsproxy -d2 "$@" >tlsproxy-log 2>&1 &
+    pid_tlsproxy=$!
+}
 server() {
-    gnutls-serv --http --port 4712 "$@" >/dev/null 2>/dev/null &
+    gnutls-serv --http --port 4712 "$@" >/dev/null 2>&1 &
+    pid_server=$!
 }
 client() {
     ./client ./proxy-ca.pem "$@" > tmp 2>&1
 }
 
 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
+    grep 'certificate invalid' tmp >/dev/null \
+        && abort 'test_no_invalid_certificate' || true
 }