Changeset e3cbda4 in mod_gnutls for t/runtests

Timestamp:

Nov 16, 2013, 2:46:50 AM (9 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

07889ab

Parents:

cf2b905

git-author:

Daniel Kahn Gillmor <dkg@…> (01/30/13 04:15:32)

git-committer:

Daniel Kahn Gillmor <dkg@…> (11/16/13 02:46:50)

Message:

MSVA: include in test framework

File:

• t/runtests (modified) (6 diffs)

t/runtests

@@ -8 +8 @@
 
 BADVARS=0
-for v in TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP; do
+for v in TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP MSVA_PORT; do
     if [ ! -v "$v" ]; then
         printf "You need to set the %s environment variable\n" "$v" >&2
@@ -24 +24 @@
 fi
 
+function stop_msva() {
+    kill %1
+}
+
 function apache_down_err() {
     printf "FAILURE: %s\n" "$TEST_NAME"
@@ -33 +37 @@
     printf "\nApache error logs:\n"
     tail "../../logs/${TEST_NAME}.error.log"
+    stop_msva
 }
 
@@ -41 +46 @@
 fi
 
+GNUPGHOME=$(pwd)/msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent &
+
+trap stop_msva EXIT
+
+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"
+
 for t in $tests; do 
+    sleep "$TEST_GAP"
     export TEST_NAME="$(basename "$t")"
     output="../../outputs/${TEST_NAME}.output"
@@ -53 +69 @@
     printf "TESTING: %s%s\n" "$TEST_NAME" "$EXPECTED_FAILURE"
     trap apache_down_err EXIT
-    /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ]
+    MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ]
 
     if (sed "s/__HOSTNAME__/${TEST_HOST}/" < ./input && sleep "$TEST_QUERY_DELAY") | \
@@ -72 +88 @@
     fi
     /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k stop || [ -e fail.server ]
-    trap - EXIT
+    trap stop_msva EXIT
     printf "SUCCESS: %s\n" "$TEST_NAME"
     cd ../..
-    sleep "$TEST_GAP"
 done
+
+stop_msva