diff options
| author | Gordon Sim <gsim@apache.org> | 2014-08-27 17:27:45 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-08-27 17:27:45 +0000 |
| commit | 109c8cc950e3c7de4e1c4bc1c84873bf95d2e058 (patch) | |
| tree | 7bb5c60b8df7bfe2a6b7de16af8f726d5bd9749f /qpid/cpp/src/tests | |
| parent | f948fc7aef622950f7a610458d2d7935ce362cef (diff) | |
| download | qpid-python-109c8cc950e3c7de4e1c4bc1c84873bf95d2e058.tar.gz | |
QPID-6049: ensure nss is initialised (and shutdown) for 1.0 connections; add 1.0 based ssl test
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620948 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/ssl_test | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test index e7c763f9ce..d681059495 100755 --- a/qpid/cpp/src/tests/ssl_test +++ b/qpid/cpp/src/tests/ssl_test @@ -35,6 +35,10 @@ OTHER_CA_PEM_FILE=${TEST_CERT_DIR}/other_ca_cert.pem PY_PING_BROKER=${QPID_TEST_SRC_DIR}/ping_broker COUNT=10 +if [[ -a $AMQP_LIB ]] ; then + MODULES="--load-module $AMQP_LIB" +fi + trap cleanup EXIT error() { echo $*; exit 1; } @@ -135,7 +139,7 @@ cleanup() { } start_ssl_broker() { - start_brokers 1 "--transport ssl --ssl-port 0 --require-encryption --auth no" + start_brokers 1 "--transport ssl --ssl-port 0 --require-encryption --auth no $MODULES" } start_ssl_mux_broker() { @@ -146,7 +150,7 @@ start_ssl_mux_broker() { sasl_config_dir=$QPID_TEST_EXEC_DIR/sasl_config start_authenticating_broker() { - start_brokers 1 "--transport ssl --ssl-port 0 --require-encryption --ssl-sasl-no-dict --ssl-require-client-authentication --auth yes --sasl-config=${sasl_config_dir}" + start_brokers 1 "--transport ssl --ssl-port 0 --require-encryption --ssl-sasl-no-dict --ssl-require-client-authentication --auth yes --sasl-config=${sasl_config_dir} $MODULES" } ssl_cluster_broker() { # $1 = port @@ -184,6 +188,13 @@ URL=amqp:ssl:$TEST_HOSTNAME:$PORT MSG=`./qpid-receive -b $URL -a "foo;{create:always}" --messages 1` test "$MSG" = "hello" || { echo "receive failed '$MSG' != 'hello'"; exit 1; } +if [[ -a $AMQP_LIB ]] ; then + echo "Testing ssl over AMQP 1.0" + ./qpid-send --connection-options '{protocol:amqp1.0}' -b $URL --content-string=hello -a "foo;{create:always}" + MSG=`./qpid-receive --connection-options '{protocol:amqp1.0}' -b $URL -a "foo;{create:always}" --messages 1` + test "$MSG" = "hello" || { echo "receive failed for AMQP 1.0 '$MSG' != 'hello'"; exit 1; } +fi + ## Test connection with a combination of URL and connection options (in messaging API) URL=$TEST_HOSTNAME:$PORT ./qpid-send -b $URL --connection-options '{transport:ssl,heartbeat:2}' --content-string='hello again' -a "foo;{create:always}" |