X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-passthrough.sh;h=55846489e52c9f52bf827301615b7270b2944403;hb=53e159fbb77f259b885a759aa5884564140e2f62;hp=5bac5bf8b784a90690f88dfc544f4fc43ff9c71d;hpb=3407f290e07d17e850a1756aebee4354db83ce71;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index 5bac5bf..5584648 100755
--- a/tests/tests-passthrough.sh
+++ b/tests/tests-passthrough.sh
@@ -27,10 +27,10 @@ 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
@@ -72,10 +72,10 @@ 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
 
 
@@ -117,6 +117,5 @@ test_invalid_certificate
 
 stop_servers
 cleanup
-rm -f tmp
 
 exit 0