You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/11/16 22:54:44 UTC
qpid-cpp git commit: NO-JIRA: Remove unwanted output from
run_ssl_tests
Repository: qpid-cpp
Updated Branches:
refs/heads/master 598ce6b3d -> 278da4e66
NO-JIRA: Remove unwanted output from run_ssl_tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/278da4e6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/278da4e6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/278da4e6
Branch: refs/heads/master
Commit: 278da4e665ce3f9c4ca58ff767f1a02011df9a76
Parents: 598ce6b
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Nov 16 17:42:49 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Nov 16 17:53:58 2017 -0500
----------------------------------------------------------------------
src/tests/run_ssl_tests | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/278da4e6/src/tests/run_ssl_tests
----------------------------------------------------------------------
diff --git a/src/tests/run_ssl_tests b/src/tests/run_ssl_tests
index 97776af..3cf1a6f 100755
--- a/src/tests/run_ssl_tests
+++ b/src/tests/run_ssl_tests
@@ -23,6 +23,7 @@
source env.sh
set -e # Fail on any un-checked error
+
trap stop_brokers EXIT
CONFIG=$(dirname $0)/qpidd-empty.conf
@@ -48,12 +49,12 @@ error() { echo $*; RET=$((RET + 1)); } # Contine with other tests but fail the s
expect_pass() {
line=$1; shift;
echo "expect pass: $*"
- "$@" || error "$0:$line: failed"
+ OUT=$("$@" 2>&1) || error -e "$OUT\n$0:$line: failed"
}
expect_fail() {
line=$1; shift;
echo "expect fail: $*"
- if "$@"; then /dev/null 2>&1 && error "$0:$line: unexpected pass"; else true; fi
+ if "$@" > /dev/null 2>&1; then error "$0:$line: unexpected pass"; else true; fi
}
# create the test certificate database
@@ -79,13 +80,13 @@ create_certs() {
#
certutil -R -d ${CERT_DB} -s "${CERT_SUBJECT}" -o ${TEST_CERT_DIR}/server.req -f ${CERT_PW_FILE} -z /bin/sh > /dev/null 2>&1
certutil -C -d ${CERT_DB} -c "Test-CA" -8 "${CERT_SAN}" -i ${TEST_CERT_DIR}/server.req -o ${TEST_CERT_DIR}/server.crt -f ${CERT_PW_FILE} -m ${RANDOM}
- certutil -A -d ${CERT_DB} -n ${TEST_HOSTNAME} -i ${TEST_CERT_DIR}/server.crt -t "Pu,,"
+ certutil -A -d ${CERT_DB} -n ${TEST_HOSTNAME} -i ${TEST_CERT_DIR}/server.crt -t "Pu,," >/dev/null 2>&1
# create a certificate to identify the client
#
certutil -R -d ${CERT_DB} -s "CN=${TEST_CLIENT_CERT}" -o ${TEST_CERT_DIR}/client.req -f ${CERT_PW_FILE} -z /bin/sh > /dev/null 2>&1
certutil -C -d ${CERT_DB} -c "Test-CA" -8 "*.client.com" -i ${TEST_CERT_DIR}/client.req -o ${TEST_CERT_DIR}/client.crt -f ${CERT_PW_FILE} -m ${RANDOM}
- certutil -A -d ${CERT_DB} -n ${TEST_CLIENT_CERT} -i ${TEST_CERT_DIR}/client.crt -t "Pu,,"
+ certutil -A -d ${CERT_DB} -n ${TEST_CLIENT_CERT} -i ${TEST_CERT_DIR}/client.crt -t "Pu,," >/dev/null 2>&1
###
#certutil -N -d ${SERVER_CERT_DIR} -f ${CERT_PW_FILE}
#certutil -S -d ${SERVER_CERT_DIR} -n ${TEST_HOSTNAME} -s "CN=${TEST_HOSTNAME}" -t "CT,," -x -f ${CERT_PW_FILE} -z /usr/bin/certutil
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org