Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 7cd6184e8 -> 6e0e1a39d
NO-JIRA Tweak RedeployTest 1) Remove use of deprecated EmbeddedJMS. 2) Change test config to use static clustering as discovery may not work in some CI environments. (cherry picked from commit e6dddf823119a8d9317f3043232846c59a1fe104) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6e0e1a39 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6e0e1a39 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6e0e1a39 Branch: refs/heads/2.6.x Commit: 6e0e1a39db1a94439d075322b4129c60301957c9 Parents: 7cd6184 Author: Justin Bertram <[email protected]> Authored: Fri Aug 17 14:06:47 2018 -0500 Committer: Clebert Suconic <[email protected]> Committed: Tue Aug 21 22:24:41 2018 -0400 ---------------------------------------------------------------------- .../test/resources/reload-backup-changed.xml | 24 ++++---------------- .../test/resources/reload-backup-original.xml | 24 ++++---------------- .../src/test/resources/reload-live-changed.xml | 24 ++++---------------- .../src/test/resources/reload-live-original.xml | 24 ++++---------------- 4 files changed, 20 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e0e1a39/tests/integration-tests/src/test/resources/reload-backup-changed.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-backup-changed.xml b/tests/integration-tests/src/test/resources/reload-backup-changed.xml index 101871b..8ea9241 100644 --- a/tests/integration-tests/src/test/resources/reload-backup-changed.xml +++ b/tests/integration-tests/src/test/resources/reload-backup-changed.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${backup-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61617</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61617</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61617</connector> + <connector name="other">tcp://127.0.0.1:61616</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e0e1a39/tests/integration-tests/src/test/resources/reload-backup-original.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-backup-original.xml b/tests/integration-tests/src/test/resources/reload-backup-original.xml index 0061be0..54a01a9 100644 --- a/tests/integration-tests/src/test/resources/reload-backup-original.xml +++ b/tests/integration-tests/src/test/resources/reload-backup-original.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${backup-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61617</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61617</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61617</connector> + <connector name="other">tcp://127.0.0.1:61616</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e0e1a39/tests/integration-tests/src/test/resources/reload-live-changed.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-live-changed.xml b/tests/integration-tests/src/test/resources/reload-live-changed.xml index 74a2ef2..17120ce 100644 --- a/tests/integration-tests/src/test/resources/reload-live-changed.xml +++ b/tests/integration-tests/src/test/resources/reload-live-changed.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${live-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61616</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61616</connector> + <connector name="other">tcp://127.0.0.1:61617</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6e0e1a39/tests/integration-tests/src/test/resources/reload-live-original.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-live-original.xml b/tests/integration-tests/src/test/resources/reload-live-original.xml index 1cbfe75..9051d58 100644 --- a/tests/integration-tests/src/test/resources/reload-live-original.xml +++ b/tests/integration-tests/src/test/resources/reload-live-original.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${live-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61616</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61616</connector> + <connector name="other">tcp://127.0.0.1:61617</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections>
