X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftests-passthrough.sh;h=c2351d9a98ae679f13dbc8d543905ebb40306a01;hb=412b6491a940ba3de97e5be95bd35197e51ee210;hp=9fb747ed645cb66c24bb2601e625fb1035727fc5;hpb=cf65dc05b04654c77b71d881e3196c2b5fa3d715;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index 9fb747e..c2351d9 100755
--- 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
+tlsproxy_background -u 4711
+server_background --x509certfile "$srcdir/server.pem" \
+                  --x509keyfile "$srcdir/server-key.pem"
+wait_for_ports 4711 4712
 
 
 echo invalid hostname
@@ -44,8 +44,7 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 echo missing server certificate
 mv certificate-localhost-server.pem .pem
@@ -73,9 +72,9 @@ test_no_invalid_certificate
 # Stop server and try a "MITM" with a bad certificate.
 echo
 kill $pid_server || echo 'failed to kill gnutls-serv'
-server --x509certfile "$srcdir/server-bad.pem" \
-       --x509keyfile "$srcdir/server-key.pem"
-sleep 1
+server_background --x509certfile "$srcdir/server-bad.pem" \
+                  --x509keyfile "$srcdir/server-key.pem"
+wait_for_ports 4712
 rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem
 
 
@@ -90,8 +89,7 @@ test_proxy_successful
 test_invalid_certificate
 
 # Create the proxy certificate.
-"$srcdir/../src/tlsproxy-add" localhost "$srcdir/server.pem" \
-    >/dev/null 2>/dev/null
+tlsproxy_add localhost server.pem
 
 echo mitm missing server certificate
 mv certificate-localhost-server.pem .pem
@@ -115,8 +113,7 @@ test_proxy_successful
 test_invalid_certificate
 
 
-stop_servers
+# stop_servers in trap-handler
 cleanup
-rm -f tmp
 
 exit 0