Changeset 302965e in mod_gnutls

Timestamp:

Feb 4, 2015, 11:02:20 AM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

9a06bbd

Parents:

e78bc78

git-author:

Thomas Klute <thomas2.klute@…> (02/04/15 10:32:39)

git-committer:

Thomas Klute <thomas2.klute@…> (02/04/15 11:02:20)

Message:

Run monkeysphere-validation-agent only for the test case using it

Running and testing monkeysphere-validation-agent for each test case
causes tests to fail when it is not available, and unnecessary delays
when it is. Test cases using monkeysphere-validation-agent must set the
USE_MSVA environment variable to enable it.

Note that TestMakefile? still calls the "pem2openpgp" tool from
Monkeysphere to set up PGP keys for the test environment.

Location:

test

Files:

• runtests (modified) (4 diffs)
• test-15_basic_msva.bash (modified) (1 diff)

test/runtests

@@ -37 +37 @@
     printf "\nApache error logs:\n"
     tail "../../logs/${TEST_NAME}.error.log"
-    stop_msva
+    if [ -n "${USE_MSVA}" ]; then
+        stop_msva
+    fi
 }
 
@@ -46 +48 @@
 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"
+    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
 
 for t in $tests; do 
@@ -69 +72 @@
     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
+        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 ]
+    fi
 
     if (sed "s/__HOSTNAME__/${TEST_HOST}/" < ./input && sleep "$TEST_QUERY_DELAY") | \
@@ -88 +95 @@
     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

test/test-15_basic_msva.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f TestMakefile t-15
+USE_MSVA="yes" make -f TestMakefile t-15