Changeset 50eab8e in mod_gnutls for test

Timestamp:

Jul 12, 2015, 2:16:10 PM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

dfd5837

Parents:

ee687ab

git-author:

Thomas Klute <thomas2.klute@…> (07/12/15 14:15:28)

git-committer:

Thomas Klute <thomas2.klute@…> (07/12/15 14:16:10)

Message:

Test suite: Configure max wait time for instance locks from Makefile.am

The increased maximum (30 seconds) should help to avoid false failures
with parallel builds on slow systems.

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• TestMakefile (modified) (1 diff)
• proxy_backend.bash (modified) (2 diffs)
• runtests (modified) (1 diff)

test/Makefile.am

@@ -84 +84 @@
         TestMakefile
 
+# Maximum wait time in seconds for flock to aquire instance lock files
+lock_wait = 30
+
 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
+        export TEST_LOCK_WAIT=$(lock_wait); \
         export TEST_HOST="$(TEST_HOST)"; \
         export TEST_IP="$(TEST_IP)"; \

test/TestMakefile

@@ -20 +20 @@
 export TEST_MSVA_MAX_WAIT ?= 10
 export TEST_QUERY_DELAY ?= 30
+export TEST_LOCK_WAIT ?= 30
 
 TEST_LOCK := ./test.lock

test/proxy_backend.bash

@@ -15 +15 @@
 : ${srcdir:="."}
 : ${APACHE2:="apache2"}
+: ${TEST_LOCK_WAIT:="30"}
 
 function backend_apache
@@ -24 +25 @@
 
     if [ -n "${lockfile}" ]; then
-        flock_cmd="flock -w 10 ${lockfile}"
+        flock_cmd="flock -w ${TEST_LOCK_WAIT} ${lockfile}"
     fi
 

test/runtests

@@ -11 +11 @@
 if [ -n "${TEST_LOCK}" ]; then
     TEST_LOCK="$(realpath ${TEST_LOCK})"
-    flock_cmd="flock -w 10 ${TEST_LOCK}"
+    flock_cmd="flock -w ${TEST_LOCK_WAIT} ${TEST_LOCK}"
 fi