You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mg...@apache.org on 2011/03/08 21:59:26 UTC
svn commit: r1079539 - in /qpid/trunk/qpid/cpp/src/tests: sasl.mk
sasl_fed_ex sasl_fed_ex_dynamic_cluster sasl_fed_ex_link_cluster
sasl_fed_ex_queue_cluster sasl_fed_ex_route_cluster
Author: mgoulish
Date: Tue Mar 8 20:59:26 2011
New Revision: 1079539
URL: http://svn.apache.org/viewvc?rev=1079539&view=rev
Log:
QPID-1672
clustered versions of the 4 federated sasl external tests.
Added:
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster (with props)
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster (with props)
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster (with props)
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster (with props)
Modified:
qpid/trunk/qpid/cpp/src/tests/sasl.mk
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
Modified: qpid/trunk/qpid/cpp/src/tests/sasl.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl.mk?rev=1079539&r1=1079538&r2=1079539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl.mk Tue Mar 8 20:59:26 2011
@@ -30,7 +30,7 @@ check_PROGRAMS+=sasl_version
sasl_version_SOURCES=sasl_version.cpp
sasl_version_LDADD=$(lib_client)
-TESTS += run_cluster_authentication_test sasl_fed sasl_fed_ex_dynamic sasl_fed_ex_link sasl_fed_ex_queue sasl_fed_ex_route
+TESTS += run_cluster_authentication_test sasl_fed sasl_fed_ex_dynamic sasl_fed_ex_link sasl_fed_ex_queue sasl_fed_ex_route sasl_fed_ex_route_cluster sasl_fed_ex_link_cluster sasl_fed_ex_queue_cluster sasl_fed_ex_dynamic_cluster
LONG_TESTS += run_cluster_authentication_soak
EXTRA_DIST += run_cluster_authentication_test sasl_fed sasl_fed_ex run_cluster_authentication_soak sasl_fed_ex_dynamic sasl_fed_ex_link sasl_fed_ex_queue sasl_fed_ex_route
Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex?rev=1079539&r1=1079538&r2=1079539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex Tue Mar 8 20:59:26 2011
@@ -124,6 +124,10 @@ DST_TCP_PORT=5807
SRC_TCP_PORT_2=5802
DST_TCP_PORT_2=5803
+CLUSTER_1_NAME=sasl_fed_ex_cluster_1
+CLUSTER_2_NAME=sasl_fed_ex_cluster_2
+
+
SSL_LIB=${moduledir}/ssl.so
CLUSTER_LIB=${moduledir}/cluster.so
@@ -182,7 +186,7 @@ function start_brokers {
--port=${SRC_TCP_PORT} \
--ssl-port ${SRC_SSL_PORT} \
${COMMON_BROKER_OPTIONS} \
- --cluster-name sasl_fed_ex_cluster \
+ --cluster-name ${CLUSTER_1_NAME} \
--log-to-file $tmp_root/qpidd_src.log 2> /dev/null
broker_ports[0]=${SRC_TCP_PORT}
@@ -192,7 +196,7 @@ function start_brokers {
--port=${SRC_TCP_PORT_2} \
--ssl-port ${SRC_SSL_PORT_2} \
${COMMON_BROKER_OPTIONS} \
- --cluster-name sasl_fed_ex_cluster \
+ --cluster-name ${CLUSTER_1_NAME} \
--log-to-file $tmp_root/qpidd_src_2.log 2> /dev/null
broker_ports[1]=${SRC_TCP_PORT_2}
@@ -205,7 +209,7 @@ function start_brokers {
--port=${DST_TCP_PORT} \
--ssl-port ${DST_SSL_PORT} \
${COMMON_BROKER_OPTIONS} \
- --cluster-name sasl_fed_ex_cluster \
+ --cluster-name ${CLUSTER_2_NAME} \
--log-to-file $tmp_root/qpidd_dst.log 2> /dev/null
broker_ports[2]=${DST_TCP_PORT}
@@ -215,7 +219,7 @@ function start_brokers {
--port=${DST_TCP_PORT_2} \
--ssl-port ${DST_SSL_PORT_2} \
${COMMON_BROKER_OPTIONS} \
- --cluster-name sasl_fed_ex_cluster \
+ --cluster-name ${CLUSTER_2_NAME} \
--log-to-file $tmp_root/qpidd_dst_2.log 2> /dev/null
broker_ports[3]=${DST_TCP_PORT_2}
@@ -316,11 +320,11 @@ fi
# to avoid false negatives.
sleep 5
+# This should work the same whether or not we are running a clustered test.
print "check the link"
link_status=$($QPID_ROUTE_EXEC link list localhost:${DST_TCP_PORT} | tail -1 | awk '{print $5}')
print "link_status == ${link_status}"
-
halt_brokers
sleep 1
Added: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster?rev=1079539&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster (added)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster Tue Mar 8 20:59:26 2011
@@ -0,0 +1,27 @@
+#! /bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+source ./test_env.sh
+
+${srcdir}/sasl_fed_ex dynamic cluster
+
+
Propchange: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
------------------------------------------------------------------------------
svn:executable = *
Added: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster?rev=1079539&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster (added)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster Tue Mar 8 20:59:26 2011
@@ -0,0 +1,27 @@
+#! /bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+source ./test_env.sh
+
+${srcdir}/sasl_fed_ex link cluster
+
+
Propchange: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
------------------------------------------------------------------------------
svn:executable = *
Added: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster?rev=1079539&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster (added)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster Tue Mar 8 20:59:26 2011
@@ -0,0 +1,27 @@
+#! /bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+source ./test_env.sh
+
+${srcdir}/sasl_fed_ex queue cluster
+
+
Propchange: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
------------------------------------------------------------------------------
svn:executable = *
Added: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster?rev=1079539&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster (added)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster Tue Mar 8 20:59:26 2011
@@ -0,0 +1,27 @@
+#! /bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+source ./test_env.sh
+
+${srcdir}/sasl_fed_ex route cluster
+
+
Propchange: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org