Changeset a61edfd in mod_gnutls

Timestamp:

Nov 5, 2015, 6:41:41 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

02a6a18

Parents:

83b3901

Message:

Manage MSVA start up wait time in milliseconds

Using milliseconds avoids floating point arithmetic, so everything can
be done in bash instead of calling "bc". This avoids a dependency, and
is probably a little faster, too (though the latter doesn't really
matter).

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• runtests (modified) (2 diffs)

test/Makefile.am

@@ -134 +134 @@
 # port for MSVA in test cases that use it
 MSVA_PORT ?= 9933
-# maximum time to wait for MSVA startup
-TEST_MSVA_MAX_WAIT ?= 10
-# wait loop time for MSVA startup
-TEST_MSVA_WAIT ?= 0.4
+# maximum time to wait for MSVA startup (milliseconds)
+TEST_MSVA_MAX_WAIT ?= 10000
+# wait loop time for MSVA startup (milliseconds)
+TEST_MSVA_WAIT ?= 400
 # seconds for the HTTP request to be sent and responded to
 TEST_QUERY_DELAY ?= 30

test/runtests

@@ -124 +124 @@
     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
+
+    # convert TEST_MSVA_WAIT to seconds because that's what "sleep" expects
+    TEST_MSVA_SLEEP="$((${TEST_MSVA_WAIT} / 1000)).$((${TEST_MSVA_WAIT} % 1000))"
+    # wait at most TEST_MSVA_MAX_WAIT milliseconds for MSVA to get ready
+    waited=0
     until [ ${ret} -eq 0 ] \
-              || [ $(echo "${waited} > ${TEST_MSVA_MAX_WAIT}" | bc) -eq 1 ]; do
+              || [ ${waited} -ge ${TEST_MSVA_MAX_WAIT} ]; do
         if msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem
         then
@@ -134 +137 @@
             echo "MSVA not ready yet"
         fi
-        sleep "${TEST_MSVA_WAIT}"
-        waited=$(echo "${waited} + ${TEST_MSVA_WAIT}" | bc)
+        sleep "${TEST_MSVA_SLEEP}"
+        waited=$((${waited} + ${TEST_MSVA_WAIT}))
     done