Changeset 321912b in mod_gnutls

Timestamp:

Oct 16, 2017, 1:53:37 AM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

265159d

Parents:

ee94de5

Message:

Test suite: Start OCSP responder from runtests if config exists

Location:

test

Files:

• runtests (modified) (3 diffs)
• test-27_OCSP_server.bash (modified) (1 diff)

test/runtests

@@ -112 +112 @@
     fi
 
+    if [ -r "${testdir}/ocsp.conf" ]; then
+        apache_service "${testdir}" "ocsp.conf" stop || true
+    fi
+
     if [ -n "${sleep_pidfile}" ]; then
         kill_by_pidfile "${sleep_pidfile}"
@@ -178 +182 @@
 fi
 
-echo "${testdir}/backend.conf"
+# Start OCSP responder, if configured
+if [ -r "${testdir}/ocsp.conf" ]; then
+    apache_service "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
+    CHECK_OCSP_SERVER="true"
+    if [ -n "${VERBOSE}" ]; then
+        echo "OCSP index for the test CA:"
+        cat authority/ocsp_index.txt
+    fi
+fi
+
+# Start proxy backend server, if configured
 if [ -r "${testdir}/backend.conf" ]; then
     apache_service "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
@@ -250 +264 @@
 fi
 
+if [ -r "${testdir}/ocsp.conf" ]; then
+    apache_service "${testdir}" "ocsp.conf" stop || true
+fi
+
 if [ -n "${USE_MSVA}" ]; then
     stop_msva

test/test-27_OCSP_server.bash

@@ -5 +5 @@
 [ -n "${OCSP_PORT}" ] || exit 77
 
-: ${srcdir:="."}
-. ${srcdir}/common.bash
-netns_reexec ${@}
-
-. $(dirname ${0})/apache_service.bash
-
-testdir="${srcdir}/tests/27_OCSP_server"
-TEST_NAME="$(basename ${testdir})"
-
-apache_service "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
-
-# trigger OCSP server test in the runtests script
-export CHECK_OCSP_SERVER="true"
-echo "OCSP index for the test CA:"
-cat authority/ocsp_index.txt
-
 ${srcdir}/runtests t-27
 ret=${?}
-
-apache_service "${testdir}" "ocsp.conf" stop
 
 echo "Checking if client actually got a stapled response."