Changeset 7adbcd7 in mod_gnutls for test

Timestamp:

Jul 2, 2015, 12:07:44 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

6ce02e2

Parents:

ae38a49

Message:

Test suite: Wait loop for MSVA startup

Until now, there was a fixed wait time for MSVA startup. This caused one
of two problems: Either the wait time was short, risiking a test failure
due to MSVA not being ready in time, or it was long, making test runs
slow. Waiting just a short time but retrying for a longer time if
necessary helps.

Location:

test

Files:

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

test/TestMakefile

@@ -17 +17 @@
 export MSVA_PORT ?= 9933
 
-export TEST_GAP ?= 1.5
+export TEST_GAP ?= 0.4
+export TEST_MSVA_MAX_WAIT ?= 10
 export TEST_QUERY_DELAY ?= 30
 

test/runtests

@@ -116 +116 @@
     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"
+    # set to 0 if MSVA is up
+    ret=1
+    export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
+    # wait at most TEST_MSVA_MAX_WAIT seconds for MSVA to get ready
+    waited=0.0
+    until [ ${ret} -eq 0 ] \
+              || [ $(echo "${waited} > ${TEST_MSVA_MAX_WAIT}" | bc) -eq 1 ]; do
+        if msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem
+        then
+            ret=0
+        else
+            echo "MSVA not ready yet"
+        fi
+        sleep "${TEST_GAP}"
+        waited=$(echo "${waited} + ${TEST_GAP}" | bc)
+    done
+
+    # check if MSVA is up, fail if not
+    if [ ${ret} -eq 0 ]; then
+        printf "\nSUCCESS: initial MSVA verification\n"
+    else
+        printf "\nFAIL: initial MSVA verification\n"
+        exit 1
+    fi
 fi