X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-normal.sh;h=3b9f9f38d670f447df9bb3d93719aa5bc31497a7;hb=94b7d1f951f5707dfc47c3ab48c0889af8b0ed9d;hp=3b50f711119d0e95309cfd1dacba9a5dc271d9c3;hpb=2405001c22e3e9109a3640de8db4152b68ff922b;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 3b50f71..3b9f9f3 100755
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -24,13 +24,13 @@ test "x$srcdir" = x && srcdir=.
 
 # Create necessary files.
 cleanup
-"$srcdir/../src/tlsproxy-setup" >/dev/null 2>/dev/null
+tlsproxy_setup
 
 # Normal tests.
 tlsproxy 4711
 server --x509certfile "$srcdir/server.pem" \
        --x509keyfile "$srcdir/server-key.pem"
-sleep 1
+wait_for_ports 4711 4712
 
 
 echo invalid hostname
@@ -73,7 +73,7 @@ echo
 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