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 44eda5b17883b3fa4da5c9e7a0d5fd3cc7dbd315..5967c44ba1ff6485d8ccf2dff9f3e3cff2fa1ba7 100755 (executable)
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -27,19 +27,19 @@ 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
-client unknown-host 80 - && abort
+client unknown-host 80 - && abort 'client unknown-host 80 -'
 test_proxy_failure
 test_no_invalid_certificate
 
 echo missing proxy and server certificate
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 test_proxy_successful
 test_invalid_certificate
 
@@ -49,41 +49,41 @@ test_invalid_certificate
 
 echo missing server certificate
 mv certificate-localhost-server.pem .pem
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
 echo missing proxy certificate
 mv certificate-localhost-proxy.pem .pem
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 mv .pem certificate-localhost-proxy.pem
 test_proxy_successful
 test_invalid_certificate
 
 echo normal connection
 # 'localhost' is the CN of tlsproxy's certificate.
-client localhost 4712 localhost || abort
+client localhost 4712 localhost || abort 'client localhost 4712 localhost'
 test_proxy_successful
 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
 
 
 echo mitm invalid hostname
-client unknown-host 80 - && abort
+client unknown-host 80 - && abort 'client unknown-host 80 -'
 test_proxy_failure
 test_no_invalid_certificate
 
 echo mitm missing proxy and server certificate
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 test_proxy_successful
 test_invalid_certificate
 
@@ -93,26 +93,25 @@ test_invalid_certificate
 
 echo mitm missing server certificate
 mv certificate-localhost-server.pem .pem
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
 echo mitm missing proxy certificate
 mv certificate-localhost-proxy.pem .pem
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 mv .pem certificate-localhost-proxy.pem
 test_proxy_successful
 test_invalid_certificate
 
 echo mitm normal connection
-client localhost 4712 invalid || abort
+client localhost 4712 invalid || abort 'client localhost 4712 invalid'
 test_proxy_successful
 test_invalid_certificate
 
 
 stop_servers
 cleanup
-rm -f tmp
 
 exit 0