From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 15 Mar 2011 20:34:33 +0000 (+0100)
Subject: tests: Correctly handle cleanup of (temporary) files.
X-Git-Tag: 0.2~15
X-Git-Url: https://ruderich.org/simon/gitweb/?p=tlsproxy%2Ftlsproxy.git;a=commitdiff_plain;h=c923f9fdfcf78fedf3e786cf00a45dcc94f6b791

tests: Correctly handle cleanup of (temporary) files.
---

diff --git a/tests/common.sh b/tests/common.sh
index 05641db..e006698 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -16,6 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+cleanup() {
+    rm -f \
+        certificate-localhost-proxy.pem certificate-localhost-server.pem \
+        proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
+}
 abort() {
     echo abort
     pkill -n gnutls-serv
diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
index 41b6e36..a8169dc 100755
--- 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.
@@ -70,6 +71,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
@@ -105,8 +107,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