Changeset 1872744 in mod_gnutls

Timestamp:

Oct 11, 2017, 12:35:37 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

acea635

Parents:

b28158c

Message:

Test suite: Rename bash function backend_apache to apache_service

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• apache_service.bash (moved) (moved from test/proxy_backend.bash) (1 diff)
• runtests (modified) (4 diffs)
• test-26_redirect_HTTP_to_HTTPS.bash (modified) (3 diffs)
• test-27_OCSP_server.bash (modified) (2 diffs)

test/Makefile.am

@@ -197 +197 @@
 
 EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
-        common.bash proxy_backend.bash runtests server-crl.template \
+        apache_service.bash common.bash runtests server-crl.template \
         softhsm.bash
 

test/apache_service.bash

@@ -4 +4 @@
 . ${srcdir}/common.bash
 
-function backend_apache
+function apache_service
 {
     # needed for start and stop

test/runtests

@@ -7 +7 @@
 set -e
 . ${srcdir}/common.bash
-. ${srcdir}/proxy_backend.bash
+. ${srcdir}/apache_service.bash
 netns_reexec ${@}
 
@@ -109 +109 @@
 
     if [ -r "${testdir}/backend.conf" ]; then
-        backend_apache "${testdir}" "backend.conf" stop || true
+        apache_service "${testdir}" "backend.conf" stop || true
     fi
 
@@ -180 +180 @@
 echo "${testdir}/backend.conf"
 if [ -r "${testdir}/backend.conf" ]; then
-    backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
+    apache_service "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
 fi
 
@@ -247 +247 @@
 
 if [ -r "${testdir}/backend.conf" ]; then
-    backend_apache "${testdir}" "backend.conf" stop || true
+    apache_service "${testdir}" "backend.conf" stop || true
 fi
 

test/test-26_redirect_HTTP_to_HTTPS.bash

@@ -11 +11 @@
 testdir="${srcdir}/tests/26_redirect_HTTP_to_HTTPS"
 TEST_NAME="$(basename ${testdir})"
-. $(dirname ${0})/proxy_backend.bash
+. $(dirname ${0})/apache_service.bash
 
 : ${TEST_HTTP_PORT:="9935"}
@@ -22 +22 @@
 function stop_backend
 {
-    backend_apache "${testdir}" "apache.conf" stop
+    apache_service "${testdir}" "apache.conf" stop
 }
-backend_apache "${testdir}" "apache.conf" start "${TEST_LOCK}"
+apache_service "${testdir}" "apache.conf" start "${TEST_LOCK}"
 trap stop_backend EXIT
 
@@ -46 +46 @@
 grep "Current TLS session: (TLS" "${output}"
 
-backend_apache "${testdir}" "apache.conf" stop
+apache_service "${testdir}" "apache.conf" stop
 trap - EXIT

test/test-27_OCSP_server.bash

@@ -9 +9 @@
 netns_reexec ${@}
 
-. $(dirname ${0})/proxy_backend.bash
+. $(dirname ${0})/apache_service.bash
 
 testdir="${srcdir}/tests/27_OCSP_server"
 TEST_NAME="$(basename ${testdir})"
 
-backend_apache "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
+apache_service "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
 
 # trigger OCSP server test in the runtests script
@@ -24 +24 @@
 ret=${?}
 
-backend_apache "${testdir}" "ocsp.conf" stop
+apache_service "${testdir}" "ocsp.conf" stop
 
 echo "Checking if client actually got a stapled response."