Changeset dda3acf in mod_gnutls

Timestamp:

Mar 25, 2015, 6:56:36 AM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

7d2123d

Parents:

6bbc00a

Message:

Speed up tests with background sleep

Until now, a significant part of test run time was spent waiting
TEST_QUERY_DELAY seconds for a response from the server. The sleep call
used for that keeps the pipe from the subshell to gnutls-cli open,
without it, gnutls-cli would terminate as soon as sed is done, leading
to failing tests. However, in many cases the wait is longer than
necessary for the test.

Sending sleep to the background allows the test case to proceed instead
of waiting for sleep to return, but has the disadvantage of leaving the
sleep process dangling until it eventually times out. I think the
significantly reduced test execution time is worth it.

Location:

test

Files:

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

test/TestMakefile

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

test/runtests

@@ -91 +91 @@
     fi
 
-    if (sed "s/__HOSTNAME__/${TEST_HOST}/" < ./input && sleep "$TEST_QUERY_DELAY") | \
-        gnutls-cli -p "${TEST_PORT}" $(cat ./gnutls-cli.args) "${TEST_HOST}" > \
-        "$output" ; then
+    # 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.
+    if (sed "s/__HOSTNAME__/${TEST_HOST}/" <./input && \
+        sleep "${TEST_QUERY_DELAY}" &) | \
+        gnutls-cli -p "${TEST_PORT}" $(cat ./gnutls-cli.args) "${TEST_HOST}" \
+        >"$output";
+    then
         if [ -e fail* ]; then
             printf "%s should have failed but succeeded\n" "$(basename "$t")" >&2
@@ -104 +113 @@
         fi
     fi
+
     if [ -e output ] ; then
         diff -q -u output <( tail -n "$(wc -l < output)" "$output" )