Changeset b28158c in mod_gnutls

Timestamp:

Oct 11, 2017, 2:25:39 AM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

1872744

Parents:

c9e4709

Message:

Test suite: Start proxy backend server from runtests if config exists

Proxy tests started the backend server from the test script until now,
so this removes a lot of duplicate code.

Location:

test

Files:

• runtests (modified) (8 diffs)
• test-19_TLS_reverse_proxy.bash (modified) (1 diff)
• test-20_TLS_reverse_proxy_client_auth.bash (modified) (1 diff)
• test-21_TLS_reverse_proxy_wrong_cert.bash (modified) (1 diff)
• test-22_TLS_reverse_proxy_crl_revoke.bash (modified) (1 diff)
• test-23_TLS_reverse_proxy_mismatched_priorities.bash (modified) (2 diffs)

test/runtests

@@ -7 +7 @@
 set -e
 . ${srcdir}/common.bash
+. ${srcdir}/proxy_backend.bash
 netns_reexec ${@}
 
@@ -17 +18 @@
     testid=${srcdir}/tests/"$(printf "%02d" "$testid")"_*
 fi
+testdir="$(realpath ${testid})"
 
 BADVARS=0
@@ -100 +102 @@
 function apache_down_err() {
     printf "FAILURE: %s\n" "$TEST_NAME"
-    ${APACHE2} -f "${t}/apache.conf" -k stop || true
+    ${APACHE2} -f "${testdir}/apache.conf" -k stop || true
     if [ -e output ]; then
         printf "\ngnutls-cli outputs:\n"
         diff_output_filter_headers "output" "$output" || true
+    fi
+
+    if [ -r "${testdir}/backend.conf" ]; then
+        backend_apache "${testdir}" "backend.conf" stop || true
     fi
 
@@ -151 +157 @@
 fi
 
-t="$(realpath ${testid})"
 export srcdir="$(realpath ${srcdir})"
-export TEST_NAME="$(basename "$t")"
+export TEST_NAME="$(basename "${testdir}")"
 output="outputs/${TEST_NAME}.output"
 rm -f "$output"
 
-if [ -e ${t}/fail.* ]; then
+if [ -e ${testdir}/fail.* ]; then
     EXPECTED_FAILURE="$(printf " (expected: %s)" fail.*)"
 else
@@ -173 +178 @@
 fi
 
-if ! ${flock_cmd} ${APACHE2} -f "${t}/apache.conf" -k start; then
-    if [ -e "${t}/fail.server" ]; then
+echo "${testdir}/backend.conf"
+if [ -r "${testdir}/backend.conf" ]; then
+    backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
+fi
+
+if ! ${flock_cmd} ${APACHE2} -f "${testdir}/apache.conf" -k start; then
+    if [ -e "${testdir}/fail.server" ]; then
         echo "Apache HTTPD failed to start as expected."
         exit 0
@@ -206 +216 @@
 # end with CRLF as required by RFC 7230, Section 3.1.1 regardless of
 # the line ends in the input file.
-if (sed -r "s/__HOSTNAME__/${TEST_HOST}/;s/\r?$/\r/" <${t}/input && \
+if (sed -r "s/__HOSTNAME__/${TEST_HOST}/;s/\r?$/\r/" <${testdir}/input && \
            run_with_pidfile "${sleep_pidfile}" sleep "${TEST_QUERY_TIMEOUT}" &) | \
-       gnutls-cli -p "${TEST_PORT}" $(cat ${t}/gnutls-cli.args) "${TEST_HOST}" \
+       gnutls-cli -p "${TEST_PORT}" $(cat ${testdir}/gnutls-cli.args) "${TEST_HOST}" \
        | tee "$output" && test "${PIPESTATUS[1]}" -eq 0;
 then
-    if [ -e ${t}/fail* ]; then
-        printf "%s should have failed but succeeded\n" "$(basename "$t")" >&2
+    if [ -e ${testdir}/fail* ]; then
+        printf "%s should have failed but succeeded\n" "$(basename "$testdir")" >&2
         exit 1
     fi
 else
-    if [ ! -e ${t}/fail* ]; then
-        printf "%s should have succeeded but failed\n" "$(basename "$t")" >&2
+    if [ ! -e ${testdir}/fail* ]; then
+        printf "%s should have succeeded but failed\n" "$(basename "$testdir")" >&2
         exit 1
     fi
@@ -225 +235 @@
 unset sleep_pidfile
 
-if [ -e ${t}/output ] ; then
-    diff_output_filter_headers "${t}/output" "$output" >&2
+if [ -e ${testdir}/output ] ; then
+    diff_output_filter_headers "${testdir}/output" "$output" >&2
 fi
 if [ -n "${USE_MSVA}" ]; then
@@ -233 +243 @@
     trap - EXIT
 fi
-${APACHE2} -f "${t}/apache.conf" -k stop || [ -e ${t}/fail.server ]
+${APACHE2} -f "${testdir}/apache.conf" -k stop || [ -e ${testdir}/fail.server ]
 printf "SUCCESS: %s\n" "$TEST_NAME"
+
+if [ -r "${testdir}/backend.conf" ]; then
+    backend_apache "${testdir}" "backend.conf" stop || true
+fi
 
 if [ -n "${USE_MSVA}" ]; then

test/test-19_TLS_reverse_proxy.bash

@@ -1 +1 @@
 #!/bin/bash
-
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/19_TLS_reverse_proxy"
-. $(dirname ${0})/proxy_backend.bash
-
-function stop_backend
-{
-    backend_apache "${testdir}" "backend.conf" stop
-}
-backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
-trap stop_backend EXIT
-
 ${srcdir}/runtests t-19
-
-backend_apache "${testdir}" "backend.conf" stop
-trap - EXIT

test/test-20_TLS_reverse_proxy_client_auth.bash

@@ -1 +1 @@
 #!/bin/bash
-
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/20_TLS_reverse_proxy_client_auth"
-. $(dirname ${0})/proxy_backend.bash
-
-function stop_backend
-{
-    backend_apache "${testdir}" "backend.conf" stop
-}
-backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
-trap stop_backend EXIT
-
 ${srcdir}/runtests t-20
-
-backend_apache "${testdir}" "backend.conf" stop
-trap - EXIT

test/test-21_TLS_reverse_proxy_wrong_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/21_TLS_reverse_proxy_wrong_cert"
-. $(dirname ${0})/proxy_backend.bash
-
-function stop_backend
-{
-    backend_apache "${testdir}" "backend.conf" stop
-}
-backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
-trap stop_backend EXIT
-
 ${srcdir}/runtests t-21
-
-backend_apache "${testdir}" "backend.conf" stop
-trap - EXIT

test/test-22_TLS_reverse_proxy_crl_revoke.bash

@@ -1 +1 @@
 #!/bin/bash
-
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/22_TLS_reverse_proxy_crl_revoke"
-. $(dirname ${0})/proxy_backend.bash
-
-function stop_backend
-{
-    backend_apache "${testdir}" "backend.conf" stop
-}
-backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
-trap stop_backend EXIT
-
 ${srcdir}/runtests t-22
-
-backend_apache "${testdir}" "backend.conf" stop
-trap - EXIT

test/test-23_TLS_reverse_proxy_mismatched_priorities.bash

@@ -1 +1 @@
 #!/bin/bash
-
-set -e
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-testdir="${srcdir}/tests/23_TLS_reverse_proxy_mismatched_priorities"
-. $(dirname ${0})/proxy_backend.bash
 
 # This test checks if server and proxy priorities are applied
@@ -13 +5 @@
 # back end server is configured not to use TLS 1.2. The proxy request
 # must fail and the client must receive an error message to pass.
-
-function stop_backend
-{
-    backend_apache "${testdir}" "backend.conf" stop
-}
-backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
-trap stop_backend EXIT
-
 ${srcdir}/runtests t-23
-
-backend_apache "${testdir}" "backend.conf" stop
-trap - EXIT