Changeset 8731286 in mod_gnutls for test/runtests

Timestamp:

Feb 5, 2015, 1:11:44 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

eea8a16

Parents:

5a8a32b (diff), 9a06bbd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'split-testsuite' into client-verify-fix

This merge will make it much easier to add a test to check if commit
5a8a32bbfb8a83fe6358c5c31c443325a7775fc2 ("TLS Client auth: Check server
verify mode if unset for dir") fixes the security issue described there.

File:

• test/runtests (moved) (moved from t/runtests) (6 diffs)

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
@@ -20 +25 @@
 
 if [ . != "$(dirname "$0")" ]; then
-    printf "You should only run this mod-gnutls test suite from the t/ directory of the mod_gnutls source.\n" >&2
+    printf "You should only run this mod-gnutls test suite from the test/ directory of the mod_gnutls source.\n" >&2
     exit 1
 fi
@@ -37 +42 @@
     printf "\nApache error logs:\n"
     tail "../../logs/${TEST_NAME}.error.log"
-    stop_msva
+    if [ -n "${USE_MSVA}" ]; then
+        stop_msva
+    fi
 }
 
@@ -46 +53 @@
 fi
 
-GNUPGHOME=$(pwd)/msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent &
+if [ -n "${USE_MSVA}" ]; then
+    GNUPGHOME=$(pwd)/msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent &
+    trap stop_msva EXIT
 
-trap stop_msva EXIT
+    sleep "$TEST_GAP"
 
-sleep "$TEST_GAP"
+    printf "TESTING: initial MSVA verification\n"
+    MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem
+    printf "\nSUCCESS: initial MSVA verification\n"
+fi
 
-printf "TESTING: initial MSVA verification\n"
-MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem  
-printf "\nSUCCESS: initial MSVA verification\n"
-
-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"
@@ -69 +80 @@
     printf "TESTING: %s%s\n" "$TEST_NAME" "$EXPECTED_FAILURE"
     trap apache_down_err EXIT
-    MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ]
+    if [ -n "${USE_MSVA}" ]; then
+        ${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
+        ${flock_cmd} \
+            /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \
+            || [ -e fail.server ]
+    fi
 
     if (sed "s/__HOSTNAME__/${TEST_HOST}/" < ./input && sleep "$TEST_QUERY_DELAY") | \
@@ -88 +108 @@
     fi
     /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k stop || [ -e fail.server ]
-    trap stop_msva EXIT
+    if [ -n "${USE_MSVA}" ]; then
+        trap stop_msva EXIT
+    else
+        trap - EXIT
+    fi
     printf "SUCCESS: %s\n" "$TEST_NAME"
     cd ../..
 done
 
-stop_msva
+if [ -n "${USE_MSVA}" ]; then
+    stop_msva
+fi