Changeset f84890d in mod_gnutls

Timestamp:

Mar 31, 2015, 8:16:39 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

54aa269

Parents:

6e6a4e4

Message:

Shared bash file for proxy back end management code

Futher test cases for proxy operation will need this code as well, so it makes
sense to keep it in a common file that individual test scripts can parse.

Location:

test

Files:

• proxy_backend.bash (added)
• test-19_TLS_reverse_proxy.bash (modified) (1 diff)

test/test-19_TLS_reverse_proxy.bash

@@ -3 +3 @@
 set -e
 
-if [ -z "${BACKEND_HOST}" ]; then
-    export BACKEND_HOST="localhost"
-fi
-if [ -z "${BACKEND_IP}" ]; then
-    export BACKEND_IP="::1"
-fi
-if [ -z "${BACKEND_PORT}" ]; then
-    export BACKEND_PORT="9934"
-fi
-
-function backend_apache
-{
-    dir="${1}"
-    conf="${2}"
-    action="${3}"
-    lockfile="${4}"
-
-    if [ -n "${lockfile}" ]; then
-        flock_cmd="flock -w 10 ${lockfile}"
-    fi
-
-    TEST_NAME="$(basename "${dir}")"
-    (
-        export TEST_NAME
-        export TEST_IP="${BACKEND_IP}"
-        export TEST_PORT="${BACKEND_PORT}"
-        case $action in
-            start)
-                cd "${dir}"
-                ${flock_cmd} \
-                    /usr/sbin/apache2 -f "$(pwd)/${conf}" -k start || return 1
-                ;;
-            stop)
-                cd "${dir}"
-                /usr/sbin/apache2 -f "$(pwd)/${conf}" -k stop || return 1
-                ;;
-        esac
-    )
-}
-
 testdir="./tests/19_TLS_reverse_proxy"
-BACKEND_LOCK="$(realpath ${testdir}/backend.lock)"
+. ./proxy_backend.bash
 
 function stop_backend