summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-03 11:49:09 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-03 11:49:12 +0200
commitfca89a2d2a912ce82f5e23c7a7a496ca8a7a73f4 (patch)
tree46fb478676a8fdf00158a379defc57505b0a925b
parent0621d0262dc5e6e5f1d956b155774a67cfbcc99c (diff)
downloadgnutls-fca89a2d2a912ce82f5e23c7a7a496ca8a7a73f4.tar.gz
tests: do not block server errors in testdsa from being printed out
Also added a delay prior to launching next server instance.
-rwxr-xr-xtests/dsa/testdsa12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/dsa/testdsa b/tests/dsa/testdsa
index 1f658fb359..4890056ce8 100755
--- a/tests/dsa/testdsa
+++ b/tests/dsa/testdsa
@@ -53,7 +53,7 @@ echo "Checking various DSA key sizes (port ${PORT})"
echo "Checking DSA-1024 with TLS 1.0"
-launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null 2>&1 &
+launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null &
PID=$!
wait_server "${PID}"
@@ -84,9 +84,10 @@ wait
# DSA 1024 + TLS 1.2
+sleep 3
echo "Checking DSA-1024 with TLS 1.2"
-launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null 2>&1 &
+launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.1024.pem" --x509keyfile "${srcdir}/dsa.1024.pem" >/dev/null &
PID=$!
wait_server "${PID}"
@@ -129,10 +130,10 @@ wait
#wait
# DSA 2048 + TLS 1.2
-
+sleep 3
echo "Checking DSA-2048 with TLS 1.2"
-launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" >/dev/null 2>&1 &
+launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.2048.pem" --x509keyfile "${srcdir}/dsa.2048.pem" >/dev/null &
PID=$!
wait_server "${PID}"
@@ -158,9 +159,10 @@ wait
# DSA 3072 + TLS 1.2
+sleep 3
echo "Checking DSA-3072 with TLS 1.2"
-launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" >/dev/null 2>&1 &
+launch_server $$ --priority "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1" --x509certfile "${srcdir}/cert.dsa.3072.pem" --x509keyfile "${srcdir}/dsa.3072.pem" >/dev/null &
PID=$!
wait_server "${PID}"