From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 17 Sep 2011 20:30:50 +0000 (+0200)
Subject: tests/tests-*.sh: Remove unnecessary calls to tlsproxy-add.
X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=commitdiff_plain;h=580b6777a6a264dc18ecb1810b3472307d6106a4

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

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index b059fac..314d798 100755
--- a/tests/tests-normal.sh
+++ b/tests/tests-normal.sh
@@ -48,17 +48,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 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
@@ -88,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
diff --git a/tests/tests-passthrough.sh b/tests/tests-passthrough.sh
index 4c6d63c..0407d41 100755
--- a/tests/tests-passthrough.sh
+++ b/tests/tests-passthrough.sh
@@ -48,17 +48,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 missing server certificate
+mv certificate-localhost-server.pem .pem
 client localhost 4712 'test server' || 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
@@ -88,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 'test server bad' || 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