X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-normal.sh;h=57ce39a8a12b8dfbcd1797ee5b98fd147ed92386;hb=b7ce41b809a3b3533d398c0da8fd9787c149434c;hp=11c5eafd85d16457d104beaa81b41b505bb637db;hpb=44ab705f30eb1fcb7a86155a6abf01b9394a8db1;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 11c5eaf..57ce39a 100755
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -2,7 +2,7 @@
 
 # Normal tlsproxy tests.
 #
-# Copyright (C) 2011-2012  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
@@ -18,105 +18,98 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# Handle empty $srcdir.
-[ "x$srcdir" = x ] && srcdir=.
-
+test "x$srcdir" = x && srcdir=.
 . "$srcdir/common.sh"
 
 
 # Create necessary files.
 cleanup
-"$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
+tlsproxy_setup
 
 # Normal tests.
-../src/tlsproxy -d2 4711 >/dev/null &
+tlsproxy 4711
 server --x509certfile "$srcdir/server.pem" \
        --x509keyfile "$srcdir/server-key.pem"
-sleep 1
+wait_for_ports 4711 4712
 
 
 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
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 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
 
 
 # Stop server and try a "MITM" with a bad certificate.
 echo
-pkill -n gnutls-serv
+kill $pid_server || echo 'failed to kill gnutls-serv'
 server --x509certfile "$srcdir/server-bad.pem" \
        --x509keyfile "$srcdir/server-key.pem"
-sleep 1
+wait_for_ports 4712
 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
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 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
 
 
-pkill -n gnutls-serv
-pkill -n tlsproxy
-
+# stop_servers in trap-handler
 cleanup
-rm -f tmp
 
 exit 0