You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2014/12/18 16:25:03 UTC
activemq git commit: add test more time to clean up on slow machines
Repository: activemq
Updated Branches:
refs/heads/trunk f57fd7daa -> b96935844
add test more time to clean up on slow machines
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b9693584
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b9693584
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b9693584
Branch: refs/heads/trunk
Commit: b969358445fca71011d3d45b8e8a68a39d671145
Parents: f57fd7d
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Thu Dec 18 16:24:51 2014 +0100
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Thu Dec 18 16:24:51 2014 +0100
----------------------------------------------------------------------
.../apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b9693584/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
index 5622297..2808ebe 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestSupport.java
@@ -80,7 +80,7 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
super.tearDown();
master.stop();
master.waitUntilStopped();
- slaveStarted.await(5, TimeUnit.SECONDS);
+ slaveStarted.await(60, TimeUnit.SECONDS);
BrokerService brokerService = slave.get();
if( brokerService!=null ) {
brokerService.stop();
@@ -129,7 +129,7 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
qConsumer.close();
assertTrue(!master.isSlave());
master.stop();
- assertTrue("slave started", slaveStarted.await(15, TimeUnit.SECONDS));
+ assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
assertTrue(!slave.get().isSlave());
final String text = "ForUWhenSlaveKicksIn";
@@ -146,7 +146,7 @@ abstract public class QueueMasterSlaveTestSupport extends JmsTopicSendReceiveWit
MessageConsumer advConsumer = session.createConsumer(AdvisorySupport.getMasterBrokerAdvisoryTopic());
master.stop();
- assertTrue("slave started", slaveStarted.await(15, TimeUnit.SECONDS));
+ assertTrue("slave started", slaveStarted.await(60, TimeUnit.SECONDS));
LOG.info("slave started");
Message advisoryMessage = advConsumer.receive(5000);
LOG.info("received " + advisoryMessage);