Changeset d39ea18 in mod_gnutls for test

Timestamp:

Jan 22, 2017, 12:45:57 PM (2 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

26ae700

Parents:

0202d6b

Message:

Test suite: Do not continue test case if Apache instance fails to start

On systems where namespaces aren't available, test cases in which
Apache HTTPD is expected not to start would sometimes fail when
running in parallel. The reason was a possible timing issue, where an
Apache instance for another test case might start before gnutls-cli is
run, and the TLS connection would unexpectedly succeed by connecting
to it.

Not attempting the TLS connection if HTTPD failed avoids this problem,
and also (slightly) speeds up tests.

File:

• test/runtests (modified) (1 diff)

test/runtests

@@ -179 +179 @@
 trap apache_down_err EXIT
 if [ -n "${USE_MSVA}" ]; then
-    MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" \
-                                        ${flock_cmd} \
-                                        ${APACHE2} -f "${t}/apache.conf" -k start \
-        || [ -e "${t}/fail.server" ]
-else
-    ${flock_cmd} \
-        ${APACHE2} -f "${t}/apache.conf" -k start \
-        || [ -e "${t}/fail.server" ]
+    export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
+fi
+if ! ${flock_cmd} ${APACHE2} -f "${t}/apache.conf" -k start; then
+    if [ -e "${t}/fail.server" ]; then
+        echo "Apache HTTPD failed to start as expected."
+        exit 0
+    else
+        echo "Apache HTTPD unexpectedly failed to start."
+        exit 1
+    fi
 fi