diff options
| author | Michael Goulish <mgoulish@apache.org> | 2011-03-18 02:44:42 +0000 |
|---|---|---|
| committer | Michael Goulish <mgoulish@apache.org> | 2011-03-18 02:44:42 +0000 |
| commit | 9056c5c0e5713de7f2123efed5bb6433fb468177 (patch) | |
| tree | 3703dedb94a0d91b47694a401f44c31f6f974036 /cpp/src | |
| parent | 05bcb9bdba777fd4a7e7bdc511d88b3d465a3931 (diff) | |
| download | qpid-python-9056c5c0e5713de7f2123efed5bb6433fb468177.tar.gz | |
QPID-3152
The non-clustered versions of the sasl_fed_ex tests should probably not attempt to load cluster.so.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1082804 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/tests/sasl_fed_ex | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/tests/sasl_fed_ex b/cpp/src/tests/sasl_fed_ex index 71dece56a9..272b42cd0d 100755 --- a/cpp/src/tests/sasl_fed_ex +++ b/cpp/src/tests/sasl_fed_ex @@ -160,7 +160,7 @@ export QPID_SSL_CERT_NAME=${TEST_HOSTNAME} COMMON_BROKER_OPTIONS=" \ --ssl-sasl-no-dict \ - --sasl-config=$sasl_config_dir \ + --sasl-config=$sasl_config_dir \ --ssl-require-client-authentication \ --auth yes \ --ssl-cert-db $CERT_DIR \ @@ -169,7 +169,6 @@ COMMON_BROKER_OPTIONS=" \ --no-data-dir \ --no-module-dir \ --load-module ${SSL_LIB} \ - --load-module ${CLUSTER_LIB} \ --mgmt-enable=yes \ --log-enable info+ \ --log-source yes \ @@ -186,6 +185,7 @@ function start_brokers { --port=${SRC_TCP_PORT} \ --ssl-port ${SRC_SSL_PORT} \ ${COMMON_BROKER_OPTIONS} \ + --load-module ${CLUSTER_LIB} \ --cluster-name ${CLUSTER_1_NAME} \ --log-to-file $tmp_root/qpidd_src.log 2> /dev/null @@ -196,6 +196,7 @@ function start_brokers { --port=${SRC_TCP_PORT_2} \ --ssl-port ${SRC_SSL_PORT_2} \ ${COMMON_BROKER_OPTIONS} \ + --load-module ${CLUSTER_LIB} \ --cluster-name ${CLUSTER_1_NAME} \ --log-to-file $tmp_root/qpidd_src_2.log 2> /dev/null @@ -209,6 +210,7 @@ function start_brokers { --port=${DST_TCP_PORT} \ --ssl-port ${DST_SSL_PORT} \ ${COMMON_BROKER_OPTIONS} \ + --load-module ${CLUSTER_LIB} \ --cluster-name ${CLUSTER_2_NAME} \ --log-to-file $tmp_root/qpidd_dst.log 2> /dev/null @@ -219,6 +221,7 @@ function start_brokers { --port=${DST_TCP_PORT_2} \ --ssl-port ${DST_SSL_PORT_2} \ ${COMMON_BROKER_OPTIONS} \ + --load-module ${CLUSTER_LIB} \ --cluster-name ${CLUSTER_2_NAME} \ --log-to-file $tmp_root/qpidd_dst_2.log 2> /dev/null @@ -329,12 +332,10 @@ halt_brokers sleep 1 -print "Removing temporary directory $tmp_root" -rm -rf $tmp_root - - if [ ${link_status} == "Operational" ]; then print "result: good" + print "Removing temporary directory $tmp_root" + rm -rf $tmp_root exit 0 fi |