You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/01/29 15:30:55 UTC
[1/2] activemq-artemis git commit: This closes #360
Repository: activemq-artemis
Updated Branches:
refs/heads/master 0d6e6a35f -> 37845ebe3
This closes #360
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/37845ebe
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/37845ebe
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/37845ebe
Branch: refs/heads/master
Commit: 37845ebe3e3b66aaa9f4697fab201c51104601f4
Parents: 0d6e6a3 062a675
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jan 29 09:30:45 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jan 29 09:30:45 2016 -0500
----------------------------------------------------------------------
.../tests/integration/cluster/bridge/BridgeFailoverTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-369 - [Artemis Testsuite]
BridgeFailoverTest#testFailoverOnBridgeNoRetryOnSameNode fails
Posted by cl...@apache.org.
ARTEMIS-369 - [Artemis Testsuite] BridgeFailoverTest#testFailoverOnBridgeNoRetryOnSameNode fails
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/062a675a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/062a675a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/062a675a
Branch: refs/heads/master
Commit: 062a675a5358013c5a5517d130a2b19684c85ba7
Parents: 0d6e6a3
Author: Erich Duda <ed...@redhat.com>
Authored: Fri Jan 29 13:41:33 2016 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jan 29 09:30:45 2016 -0500
----------------------------------------------------------------------
.../tests/integration/cluster/bridge/BridgeFailoverTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/062a675a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
index 1e2d02e..d46a61e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeFailoverTest.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.tests.integration.cluster.bridge;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -177,7 +178,7 @@ public class BridgeFailoverTest extends MultiServerTestBase {
locatorConsumer.close();
- waitForServerToStart(backupServers[4]);
+ assertTrue("Backup server didn't activate.", backupServers[4].waitForActivation(5, TimeUnit.SECONDS));
for (int i = 100; i < 200; i++) {
ClientMessage msg = session.createMessage(true);