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

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

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index b6d6c1d7b97ba90dbef4f56a430f811bfa7847a9..5967c44ba1ff6485d8ccf2dff9f3e3cff2fa1ba7 100755 (executable)
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -27,10 +27,10 @@ cleanup
 "$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
 
 # 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
@@ -70,10 +70,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
 
 
@@ -113,6 +113,5 @@ test_invalid_certificate
 
 stop_servers
 cleanup
-rm -f tmp
 
 exit 0