tests: Separate common test data, move tests in tests-normal.sh.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ec752e26c335db5cc15bc5f4652ddcf666aa873..f41c6b0705f42971a408687a0fed1420aac20f7b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 TESTS = tests.sh
-dist_check_SCRIPTS = tests.sh
+dist_check_SCRIPTS = tests.sh tests-normal.sh common.sh
 check_PROGRAMS = client
 client_SOURCES = client.c
 

diff --git a/tests/common.sh b/tests/common.sh
new file mode 100644 (file)
index 0000000..05641db
--- /dev/null
+++ b/tests/common.sh
@@ -0,0 +1,46 @@
+# Functions used by all tests.
+#
+# Copyright (C) 2011  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+abort() {
+    echo abort
+    pkill -n gnutls-serv
+    pkill -n tlsproxy
+    exit 1
+}
+server() {
+    gnutls-serv --http --port 4712 "$@" >/dev/null 2>/dev/null &
+}
+client() {
+    ./client ./proxy-ca.pem "$@" > tmp 2>&1
+}
+
+test_proxy_failure() {
+    grep 'proxy failure' tmp >/dev/null || abort
+    grep 'response: HTTP/1.0 503 Forwarding failure' tmp >/dev/null \
+        || abort
+}
+test_proxy_successful() {
+    grep 'response: HTTP/1.0 200 Connection established' tmp >/dev/null \
+        || abort
+}
+test_invalid_certificate() {
+    grep 'certificate invalid' tmp >/dev/null || abort
+}
+test_no_invalid_certificate() {
+    grep 'certificate invalid' tmp >/dev/null && abort
+}

diff --git a/tests/tests-normal.sh b/tests/tests-normal.sh
new file mode 100755 (executable)
index 0000000..41b6e36
--- /dev/null
+++ b/tests/tests-normal.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Normal tlsproxy tests.
+#
+# Copyright (C) 2011  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Handle empty $srcdir.
+[ "x$srcdir" = x ] && srcdir=.
+
+. $srcdir/common.sh
+
+
+# Create necessary files.
+$srcdir/../src/tlsproxy-setup >/dev/null 2>/dev/null
+
+# Normal tests.
+../src/tlsproxy -d2 4711 >/dev/null &
+server --x509certfile $srcdir/server.pem \
+       --x509keyfile $srcdir/server-key.pem
+sleep 1
+
+
+echo invalid hostname
+client unknown-host 80 - && abort
+test_proxy_failure
+test_no_invalid_certificate
+
+echo missing proxy and server certificate
+client localhost 4712 invalid || abort
+test_proxy_successful
+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
+client localhost 4712 invalid || abort
+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
+client localhost 4712 localhost || abort
+test_proxy_successful
+test_no_invalid_certificate
+
+
+# Stop server and try a "MITM" with a bad certificate.
+echo
+pkill -n gnutls-serv
+server --x509certfile $srcdir/server-bad.pem \
+       --x509keyfile $srcdir/server-key.pem
+sleep 1
+
+
+echo mitm invalid hostname
+client unknown-host 80 - && abort
+test_proxy_failure
+test_no_invalid_certificate
+
+echo mitm missing proxy and server certificate
+client localhost 4712 invalid || abort
+test_proxy_successful
+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
+client localhost 4712 invalid || abort
+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
+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
+
+exit 0

diff --git a/tests/tests.sh b/tests/tests.sh
index 13735a0e42b983bad5365310c56b0a7c08dfd71e..0dc79127ff97e86cd646491d6a0ca711fa823d27 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -21,119 +21,5 @@
 # Handle empty $srcdir.
 [ "x$srcdir" = x ] && srcdir=.
 
-abort() {
-    echo abort
-    pkill -n gnutls-serv
-    pkill -n tlsproxy
-    exit 1
-}
-server() {
-    gnutls-serv --http --port 4712 "$@" >/dev/null 2>/dev/null &
-}
-client() {
-    ./client ./proxy-ca.pem "$@" > tmp 2>&1
-}
-
-test_proxy_failure() {
-    grep 'proxy failure' tmp >/dev/null || abort
-    grep 'response: HTTP/1.0 503 Forwarding failure' tmp >/dev/null \
-        || abort
-}
-test_proxy_successful() {
-    grep 'response: HTTP/1.0 200 Connection established' tmp >/dev/null \
-        || abort
-}
-test_invalid_certificate() {
-    grep 'certificate invalid' tmp >/dev/null || abort
-}
-test_no_invalid_certificate() {
-    grep 'certificate invalid' tmp >/dev/null && abort
-}
-
-
-# Create necessary files.
-$srcdir/../src/tlsproxy-setup >/dev/null 2>/dev/null
-
-# Normal tests.
-../src/tlsproxy -d2 4711 >/dev/null &
-server --x509certfile $srcdir/server.pem \
-       --x509keyfile $srcdir/server-key.pem
-sleep 1
-
-
-echo invalid hostname
-client unknown-host 80 - && abort
-test_proxy_failure
-test_no_invalid_certificate
-
-echo missing proxy and server certificate
-client localhost 4712 invalid || abort
-test_proxy_successful
-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
-client localhost 4712 invalid || abort
-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
-client localhost 4712 localhost || abort
-test_proxy_successful
-test_no_invalid_certificate
-
-
-# Stop server and try a "MITM" with a bad certificate.
-echo
-pkill -n gnutls-serv
-server --x509certfile $srcdir/server-bad.pem \
-       --x509keyfile $srcdir/server-key.pem
-sleep 1
-
-
-echo mitm invalid hostname
-client unknown-host 80 - && abort
-test_proxy_failure
-test_no_invalid_certificate
-
-echo mitm missing proxy and server certificate
-client localhost 4712 invalid || abort
-test_proxy_successful
-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
-client localhost 4712 invalid || abort
-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
-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
-
-exit 0
+echo "RUNNING NORMAL TESTS"
+$srcdir/tests-normal.sh