Changeset 1872744 in mod_gnutls


Ignore:
Timestamp:
Oct 11, 2017, 12:35:37 PM (2 months ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
master
Children:
acea635
Parents:
b28158c
Message:

Test suite: Rename bash function backend_apache to apache_service

Location:
test
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r97d7c63 r1872744  
    197197
    198198EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
    199         common.bash proxy_backend.bash runtests server-crl.template \
     199        apache_service.bash common.bash runtests server-crl.template \
    200200        softhsm.bash
    201201
  • test/apache_service.bash

    rc9e4709 r1872744  
    44. ${srcdir}/common.bash
    55
    6 function backend_apache
     6function apache_service
    77{
    88    # needed for start and stop
  • test/runtests

    rb28158c r1872744  
    77set -e
    88. ${srcdir}/common.bash
    9 . ${srcdir}/proxy_backend.bash
     9. ${srcdir}/apache_service.bash
    1010netns_reexec ${@}
    1111
     
    109109
    110110    if [ -r "${testdir}/backend.conf" ]; then
    111         backend_apache "${testdir}" "backend.conf" stop || true
     111        apache_service "${testdir}" "backend.conf" stop || true
    112112    fi
    113113
     
    180180echo "${testdir}/backend.conf"
    181181if [ -r "${testdir}/backend.conf" ]; then
    182     backend_apache "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
     182    apache_service "${testdir}" "backend.conf" start "${BACKEND_LOCK}"
    183183fi
    184184
     
    247247
    248248if [ -r "${testdir}/backend.conf" ]; then
    249     backend_apache "${testdir}" "backend.conf" stop || true
     249    apache_service "${testdir}" "backend.conf" stop || true
    250250fi
    251251
  • test/test-26_redirect_HTTP_to_HTTPS.bash

    r94430e6 r1872744  
    1111testdir="${srcdir}/tests/26_redirect_HTTP_to_HTTPS"
    1212TEST_NAME="$(basename ${testdir})"
    13 . $(dirname ${0})/proxy_backend.bash
     13. $(dirname ${0})/apache_service.bash
    1414
    1515: ${TEST_HTTP_PORT:="9935"}
     
    2222function stop_backend
    2323{
    24     backend_apache "${testdir}" "apache.conf" stop
     24    apache_service "${testdir}" "apache.conf" stop
    2525}
    26 backend_apache "${testdir}" "apache.conf" start "${TEST_LOCK}"
     26apache_service "${testdir}" "apache.conf" start "${TEST_LOCK}"
    2727trap stop_backend EXIT
    2828
     
    4646grep "Current TLS session: (TLS" "${output}"
    4747
    48 backend_apache "${testdir}" "apache.conf" stop
     48apache_service "${testdir}" "apache.conf" stop
    4949trap - EXIT
  • test/test-27_OCSP_server.bash

    r94430e6 r1872744  
    99netns_reexec ${@}
    1010
    11 . $(dirname ${0})/proxy_backend.bash
     11. $(dirname ${0})/apache_service.bash
    1212
    1313testdir="${srcdir}/tests/27_OCSP_server"
    1414TEST_NAME="$(basename ${testdir})"
    1515
    16 backend_apache "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
     16apache_service "${testdir}" "ocsp.conf" start "${OCSP_LOCK}"
    1717
    1818# trigger OCSP server test in the runtests script
     
    2424ret=${?}
    2525
    26 backend_apache "${testdir}" "ocsp.conf" stop
     26apache_service "${testdir}" "ocsp.conf" stop
    2727
    2828echo "Checking if client actually got a stapled response."
Note: See TracChangeset for help on using the changeset viewer.