Changeset 9a06bbd in mod_gnutls for test

Timestamp:

Feb 4, 2015, 11:27:22 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

8731286, c4a015b

Parents:

302965e

Message:

Use flock instead of delays to protect Apache

The "sleep" call before each Apache start slows tests down, but removing
it leads to occasional failures, presumably due to a mid-shutdown Apache
process getting in the way of a starting one. Use a lock file to prevent
that while removing the sleep.

Location:

test

Files:

• .gitignore (modified) (1 diff)
• TestMakefile (modified) (1 diff)
• runtests (modified) (3 diffs)

test/.gitignore

@@ -16 +16 @@
 *.log
 *.trs
+test.lock

test/TestMakefile

@@ -15 +15 @@
 export TEST_QUERY_DELAY ?= 2
 
+TEST_LOCK := ./test.lock
+
 all: setup.done
-        ./runtests
+        TEST_LOCK=$(TEST_LOCK) ./runtests
 
 t-%: setup.done
-        ./runtests $@
+        TEST_LOCK=$(TEST_LOCK) ./runtests $@
 
 

test/runtests

@@ -6 +6 @@
 
 tests="${1##t-}"
+
+if [ -n "${TEST_LOCK}" ]; then
+    TEST_LOCK="$(realpath ${TEST_LOCK})"
+    flock_cmd="flock -w 10 ${TEST_LOCK}"
+fi
 
 BADVARS=0
@@ -59 +64 @@
 fi
 
-for t in $tests; do 
-    sleep "$TEST_GAP"
+for t in $tests; do
+    if [ -z "${flock_cmd}" ]; then
+        echo "Warning: no lock file set"
+        sleep "$TEST_GAP"
+    fi
     export TEST_NAME="$(basename "$t")"
     output="../../outputs/${TEST_NAME}.output"
@@ -73 +81 @@
     trap apache_down_err EXIT
     if [ -n "${USE_MSVA}" ]; then
-        MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ]
+        ${flock_cmd} \
+            MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" \
+            /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \
+            || [ -e fail.server ]
     else
-        /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ]
+        ${flock_cmd} \
+            /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \
+            || [ -e fail.server ]
     fi