tests/tests-*.sh: Remove unnecessary calls to tlsproxy-add.

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

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 41b6e36817d478b34c8cafec50325ba912917e54..314d798c0b88be60d73a2ea26fca90c9a2a2046d 100755 (executable)
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -25,6 +25,7 @@
 
 
 # Create necessary files.
+cleanup
 $srcdir/../src/tlsproxy-setup >/dev/null 2>/dev/null
 
 # Normal tests.
@@ -47,18 +48,16 @@ test_invalid_certificate
 # Create the proxy certificate.
 $srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
     >/dev/null 2>/dev/null
-rm -f certificate-localhost-server.pem
 
 echo missing server certificate
+mv certificate-localhost-server.pem .pem
 client localhost 4712 invalid || abort
+mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
-# Create the proxy and server certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
-    >/dev/null 2>/dev/null
-
 echo normal connection
+# 'localhost' is the CN of tlsproxy's certificate.
 client localhost 4712 localhost || abort
 test_proxy_successful
 test_no_invalid_certificate
@@ -70,6 +69,7 @@ pkill -n gnutls-serv
 server --x509certfile $srcdir/server-bad.pem \
        --x509keyfile $srcdir/server-key.pem
 sleep 1
+rm -f certificate-localhost-proxy.pem certificate-localhost-server.pem
 
 
 echo mitm invalid hostname
@@ -85,17 +85,14 @@ test_invalid_certificate
 # Create the proxy certificate.
 $srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
     >/dev/null 2>/dev/null
-rm -f certificate-localhost-server.pem
 
 echo mitm missing server certificate
+mv certificate-localhost-server.pem .pem
 client localhost 4712 invalid || abort
+mv .pem certificate-localhost-server.pem
 test_proxy_successful
 test_invalid_certificate
 
-# Create the proxy and server certificate.
-$srcdir/../src/tlsproxy-add localhost $srcdir/server.pem \
-    >/dev/null 2>/dev/null
-
 echo mitm normal connection
 client localhost 4712 invalid || abort
 test_proxy_successful
@@ -105,8 +102,7 @@ test_invalid_certificate
 pkill -n gnutls-serv
 pkill -n tlsproxy
 
-rm -f tmp \
-    certificate-localhost-proxy.pem certificate-localhost-server.pem \
-    proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+cleanup
+rm -f tmp
 
 exit 0