Changes in test/proxy_backend.bash [50eab8e:f87c1b5] in mod_gnutls

File:

• test/proxy_backend.bash (modified) (4 diffs)

test/proxy_backend.bash

@@ -2 +2 @@
 
 set -e
+. ${srcdir}/common.bash
 
 if [ -z "${BACKEND_HOST}" ]; then
@@ -12 +13 @@
     export BACKEND_PORT="9934"
 fi
-: ${BACKEND_LOCK:="backend.lock"}
+: ${BACKEND_PID:="backend.pid"}
 : ${srcdir:="."}
 : ${APACHE2:="apache2"}
@@ -24 +25 @@
     lockfile="${4}"
 
-    if [ -n "${lockfile}" ]; then
-        flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
-    fi
-
     TEST_NAME="$(basename "${dir}")"
     (
@@ -36 +33 @@
         case $action in
             start)
+                if [ -n "${USE_TEST_NAMESPACE}" ]; then
+                    echo "Using namespaces to isolate tests, no need for" \
+                         "locking."
+                    flock_cmd=""
+                elif [ -n "${lockfile}" ]; then
+                    flock_cmd="${FLOCK} -w ${TEST_LOCK_WAIT} ${lockfile}"
+                else
+                    echo "Locking disabled, using wait based on proxy PID file."
+                    wait_pid_gone "${BACKEND_PID}"
+                    flock_cmd=""
+                fi
                 ${flock_cmd} \
                     ${APACHE2} -f "$(realpath ${testdir}/${conf})" -k start || return 1