tests: Wait until tlsproxy and gnutls-serv are ready.

[tlsproxy/tlsproxy.git] / tests / tests-passthrough.sh

diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index dcd96885309615db55cac9ebac2b5816b35f60e3..55846489e52c9f52bf827301615b7270b2944403 100755 (executable)
--- a/tests/tests-passthrough.sh
+++ b/tests/tests-passthrough.sh
@@ -18,9 +18,7 @@
 # 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"
 
 
@@ -29,19 +27,19 @@ cleanup
 "$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
 
 # Normal tests.
-../src/tlsproxy -d2 -u 4711 >/dev/null &
+tlsproxy -u 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 'test server' || abort
+client localhost 4712 'test server' || abort 'client localhost 4712 test server'
 test_proxy_successful
 test_invalid_certificate
 
@@ -51,7 +49,7 @@ test_invalid_certificate
 
 echo missing server certificate
 mv certificate-localhost-server.pem .pem
-client localhost 4712 'test server' || abort
+client localhost 4712 'test server' || abort 'client localhost 4712 test server'
 mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
@@ -60,34 +58,34 @@ echo missing proxy certificate
 mv certificate-localhost-proxy.pem .pem
 # "invalid" to prevent user error if the proxy certificate gets deleted (but
 # the server certificate is still readable).
-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 'test server bad' || abort
+client localhost 4712 'test server bad' || abort 'client localhost 4712 test server bad'
 test_proxy_successful
 test_invalid_certificate
 
@@ -97,7 +95,7 @@ test_invalid_certificate
 
 echo mitm missing server certificate
 mv certificate-localhost-server.pem .pem
-client localhost 4712 'test server bad' || abort
+client localhost 4712 'test server bad' || abort 'client localhost 4712 test server bad'
 mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
@@ -106,21 +104,18 @@ echo mitm missing proxy certificate
 mv certificate-localhost-proxy.pem .pem
 # "invalid" to prevent user error if the proxy certificate gets deleted (but
 # the server certificate is still readable).
-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
 cleanup
-rm -f tmp
 
 exit 0