Repository: qpid-cpp Updated Branches: refs/heads/master ffe468c03 -> 6370e1b23
QPID-8043: relax -e for availability checks, allows them to work and indicate whats happening. Avoids spurious failure without indicated cause following changes in 598ce6b3d06b8cc041013a6d3e86dcf8d9c432f2 if the tooling needed happens not to be available. Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/b6371eaa Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/b6371eaa Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/b6371eaa Branch: refs/heads/master Commit: b6371eaa694414f3fc37fe5a531b1a72b719cadb Parents: ffe468c Author: Robbie Gemmell <rob...@apache.org> Authored: Tue Nov 21 12:59:33 2017 +0000 Committer: Robbie Gemmell <rob...@apache.org> Committed: Tue Nov 21 12:59:33 2017 +0000 ---------------------------------------------------------------------- src/tests/run_ssl_tests | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/b6371eaa/src/tests/run_ssl_tests ---------------------------------------------------------------------- diff --git a/src/tests/run_ssl_tests b/src/tests/run_ssl_tests index 751a0cc..cc37db1 100755 --- a/src/tests/run_ssl_tests +++ b/src/tests/run_ssl_tests @@ -22,7 +22,7 @@ # Run a simple test over SSL source env.sh -set -e # Fail on any un-checked error +set -e # Fail on any un-checked error. Relaxed at points below. trap stop_brokers EXIT @@ -167,7 +167,9 @@ ssl_cluster_broker() { # $1 = port qpid-ping -Pssl -b $TEST_HOSTNAME:$1 -q || { echo "Cannot connect to broker on $1"; exit 1; } } +set +e CERTUTIL=$(type -p certutil) +set -e if [[ !(-x $CERTUTIL) ]] ; then echo "No certutil, skipping ssl test"; exit $RET @@ -176,6 +178,7 @@ fi if [[ !(-e ${CERT_PW_FILE}) ]] ; then echo password > ${CERT_PW_FILE} fi + delete_certs create_certs || fatal "Could not create test certificate database" @@ -258,6 +261,7 @@ stop_brokers ### Additional tests that require 'openssl' and 'pk12util' to be installed (optional) +set +e PK12UTIL=$(type -p pk12util) if [[ !(-x $PK12UTIL) ]] ; then echo >&2 "'pk12util' command not available, skipping remaining tests" @@ -276,6 +280,7 @@ if (( PY_VERSION < 0x02060000 )); then echo >&2 "Detected python version < 2.6 - skipping certificate verification tests" exit $RET fi +set -e echo "Testing Certificate validation and Authentication with the Python Client..." --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
