tests: Add tlsproxy_setup() helper function.

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

diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index 9fb747ed645cb66c24bb2601e625fb1035727fc5..2e0f90e30a3c0aececee5506078638849654b379 100755 (executable)
--- a/tests/tests-passthrough.sh
+++ b/tests/tests-passthrough.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 -u 4711
 server --x509certfile "$srcdir/server.pem" \
        --x509keyfile "$srcdir/server-key.pem"
-sleep 1
+wait_for_ports 4711 4712
 
 
 echo invalid hostname
@@ -75,7 +75,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
 
 
@@ -117,6 +117,5 @@ test_invalid_certificate
 
 stop_servers
 cleanup
-rm -f tmp
 
 exit 0