Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E4FA610747 for ; Thu, 5 Mar 2015 09:18:30 +0000 (UTC) Received: (qmail 87650 invoked by uid 500); 5 Mar 2015 09:18:18 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 87569 invoked by uid 500); 5 Mar 2015 09:18:18 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 87388 invoked by uid 99); 5 Mar 2015 09:18:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 09:18:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED607E0844; Thu, 5 Mar 2015 09:18:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andytaylor@apache.org To: commits@activemq.apache.org Date: Thu, 05 Mar 2015 09:18:18 -0000 Message-Id: <5cd711446d514b72b55f49623c883de6@git.apache.org> In-Reply-To: <0d782c87fb1344b28eedb0c1d0c2a5d8@git.apache.org> References: <0d782c87fb1344b28eedb0c1d0c2a5d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] activemq-6 git commit: Make test more robust Make test more robust It is possible for the createHAServerLocator() method to return a connection to the node with the non-default password causing the test to fail. Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/080c1dd0 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/080c1dd0 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/080c1dd0 Branch: refs/heads/master Commit: 080c1dd0589346da1b0d50449c02ba2e81ed35c7 Parents: 9a88941 Author: jbertram Authored: Wed Mar 4 13:11:00 2015 -0600 Committer: jbertram Committed: Wed Mar 4 14:44:24 2015 -0600 ---------------------------------------------------------------------- .../integration/cluster/topology/TopologyClusterTestBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/080c1dd0/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java index b18be94..69810f7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/topology/TopologyClusterTestBase.java @@ -413,7 +413,7 @@ public abstract class TopologyClusterTestBase extends ClusterTestBase } Assert.assertFalse("cluster manager should stop", servers[4].getClusterManager().isStarted()); final String address = "foo1235"; - ServerLocator locator = createHAServerLocator(); + ServerLocator locator = createNonHALocator(isNetty()); ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(config.getClusterUser(), CLUSTER_PASSWORD, false, true, true, false, 1); session.createQueue(address, address, true);