Changeset a61edfd in mod_gnutls
- Timestamp:
- Nov 5, 2015, 6:41:41 PM (7 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- 02a6a18
- Parents:
- 83b3901
- Location:
- test
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/Makefile.am
r83b3901 ra61edfd 134 134 # port for MSVA in test cases that use it 135 135 MSVA_PORT ?= 9933 136 # maximum time to wait for MSVA startup 137 TEST_MSVA_MAX_WAIT ?= 10 138 # wait loop time for MSVA startup 139 TEST_MSVA_WAIT ?= 0.4136 # maximum time to wait for MSVA startup (milliseconds) 137 TEST_MSVA_MAX_WAIT ?= 10000 138 # wait loop time for MSVA startup (milliseconds) 139 TEST_MSVA_WAIT ?= 400 140 140 # seconds for the HTTP request to be sent and responded to 141 141 TEST_QUERY_DELAY ?= 30 -
test/runtests
r83b3901 ra61edfd 124 124 ret=1 125 125 export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" 126 # wait at most TEST_MSVA_MAX_WAIT seconds for MSVA to get ready 127 waited=0.0 126 127 # convert TEST_MSVA_WAIT to seconds because that's what "sleep" expects 128 TEST_MSVA_SLEEP="$((${TEST_MSVA_WAIT} / 1000)).$((${TEST_MSVA_WAIT} % 1000))" 129 # wait at most TEST_MSVA_MAX_WAIT milliseconds for MSVA to get ready 130 waited=0 128 131 until [ ${ret} -eq 0 ] \ 129 || [ $ (echo "${waited} > ${TEST_MSVA_MAX_WAIT}" | bc) -eq 1]; do132 || [ ${waited} -ge ${TEST_MSVA_MAX_WAIT} ]; do 130 133 if msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem 131 134 then … … 134 137 echo "MSVA not ready yet" 135 138 fi 136 sleep "${TEST_MSVA_ WAIT}"137 waited=$( echo "${waited} + ${TEST_MSVA_WAIT}" | bc)139 sleep "${TEST_MSVA_SLEEP}" 140 waited=$((${waited} + ${TEST_MSVA_WAIT})) 138 141 done 139 142
Note: See TracChangeset
for help on using the changeset viewer.