tests: Kill PIDs in stop_servers(), not process names.

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

diff --git a/tests/common.sh b/tests/common.sh
index 3b08d53da77e4d286b6d17438be64c7feb6d5599..587b5f897f56e3b97b5c61a7addb07bd3a824d57 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -25,33 +25,41 @@ cleanup() {
         proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
 }
 stop_servers() {
-    pkill -n gnutls-serv
-    pkill -n tlsproxy
+    kill $pid_server || echo 'failed to kill gnutls-serv'
+    kill $pid_tlsproxy || echo 'failed to kill tlsproxy'
 }
 abort() {
-    echo abort
+    echo "abort: $*"
     stop_servers
     exit 1
 }
+tlsproxy() {
+    ../src/tlsproxy -d2 "$@" >/dev/null &
+    pid_tlsproxy=$!
+}
 server() {
     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 || true
+    grep 'certificate invalid' tmp >/dev/null \
+        && abort 'test_no_invalid_certificate' || true
 }