Changeset 232fb60 in mod_gnutls

Timestamp:

Mar 31, 2015, 7:03:16 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

1b57c56

Parents:

a213967

Message:

runtests: Stop background sleep after gnutls-cli is done

The PID of the background sleep used to wait for an HTTP response is now
stored in a temporary file, so the sleep process can be stopped when it
is no longer needed. This avoids cluttering the system with sleep
processes and thus allows a more than generous timeout, which should be
useful for slow build systems.

Location:

test

Files:

• TestMakefile (modified) (1 diff)
• runtests (modified) (4 diffs)

test/TestMakefile

@@ -13 +13 @@
 
 export TEST_GAP ?= 1.5
-export TEST_QUERY_DELAY ?= 6
+export TEST_QUERY_DELAY ?= 30
 
 TEST_LOCK := ./test.lock

test/runtests

@@ -44 +44 @@
 function diff_output_filter_headers()
 {
-    expected="$1"
-    actual="$2"
+    local expected="$1"
+    local actual="$2"
     diff $3 -u "${expected}" <( cat "${actual}" | \
         grep -v -P '^Date:\s.*GMT\s?$' | \
         grep -v -P '^Server:\sApache'  | \
         tail -n "$(wc -l < ${expected})" )
+}
+
+# Run a command, storing its PID in the given file
+# Usage: run_with_pidfile PIDFILE COMMAND [ARGS]
+function run_with_pidfile()
+{
+    local pidfile=$1
+    local cmd=$2
+    shift 2
+    echo $BASHPID >${pidfile}
+    exec ${cmd} $*
+}
+
+# Kills the process with the PID contained in a given file, then
+# deletes the file.
+# Usage: kill_by_pidfile PIDFILE
+function kill_by_pidfile()
+{
+    local pidfile="${1}"
+    # In some testcases with expected failure, gnutls-cli sometimes
+    # failed before the subshell in front of the pipe (see gnutls-cli
+    # call below) got so far as to write the PID, much less exec
+    # sleep. So we need to check if there actually is anything to
+    # kill.
+    if [ -n "${pidfile}" ]; then
+        local pid=$(cat "${pidfile}")
+        if [ -n "${pid}" ] && ps -p "${pid}"; then
+            kill "${pid}"
+        fi
+        rm "${pidfile}"
+    fi
 }
 
@@ -59 +90 @@
         diff_output_filter_headers "output" "$output" || true
     fi
+
+    if [ -n "${sleep_pidfile}" ]; then
+        kill_by_pidfile "${sleep_pidfile}"
+    fi
+
     printf "\nApache error logs:\n"
     tail "../../logs/${TEST_NAME}.error.log"
+
     if [ -n "${USE_MSVA}" ]; then
         stop_msva
@@ -110 +147 @@
     fi
 
+    # PID file for sleep command (explanation below)
+    sleep_pidfile="$(mktemp mod_gnutls_test-XXXXXX.pid)"
+
     # The sleep call keeps the pipe from the subshell to gnutls-cli
     # open. Without it gnutls-cli would terminate as soon as sed is
     # done, and not wait for a response from the server, leading to
     # failing tests. Sending sleep to the background allows the test
-    # case to proceed instead of waiting for it to return, but has the
-    # disadvantage of leaving the sleep process dangling until it
-    # eventually times out. Still preferable to a fixed delay.
+    # case to proceed instead of waiting for it to return. The sleep
+    # process is stopped after gnutls-cli terminates.
     if (sed "s/__HOSTNAME__/${TEST_HOST}/" <./input && \
-        sleep "${TEST_QUERY_DELAY}" &) | \
+        run_with_pidfile "${sleep_pidfile}" sleep "${TEST_QUERY_DELAY}" &) | \
         gnutls-cli -p "${TEST_PORT}" $(cat ./gnutls-cli.args) "${TEST_HOST}" \
         >"$output";
@@ -132 +171 @@
         fi
     fi
+
+    kill_by_pidfile "${sleep_pidfile}"
 
     if [ -e output ] ; then