Merge pull request #6230 from bandi13/zd15855

Fix for variable server startup time
This commit is contained in:
JacobBarthelmeh
2023-03-28 09:13:52 -06:00
committed by GitHub
2 changed files with 18 additions and 2 deletions

View File

@ -406,7 +406,15 @@ generate_port() {
generate_port
openssl s_server $V4V6_FLAG -cert ./certs/server-cert.pem -key certs/server-key.pem -www -port $port &
openssl_pid=$!
sleep 0.1
MAX_TIMEOUT=10
until nc -z localhost $port # Wait for openssl to be ready
do
sleep 0.05
if [ "$MAX_TIMEOUT" == "0" ]; then
break
fi
((MAX_TIMEOUT--))
done
printf '%s\n\n' "------------- TEST CASE 6 SHOULD PASS ----------------------"
# client asks for OCSP staple but doesn't fail when none returned

View File

@ -471,7 +471,15 @@ generate_port() {
generate_port
openssl s_server -cert ./certs/server-cert.pem -key certs/server-key.pem -www -port $port &
openssl_pid=$!
sleep 0.1
MAX_TIMEOUT=10
until nc -z localhost $port # Wait for openssl to be ready
do
sleep 0.05
if [ "$MAX_TIMEOUT" == "0" ]; then
break
fi
((MAX_TIMEOUT--))
done
printf '%s\n\n' "------------- TEST CASE 9 SHOULD PASS ----------------------"
# client asks for OCSP staple but doesn't fail when none returned