this test can take more than 2mins in ci env, adding some more diagnostics and giving it more time
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/21662656 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/21662656 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/21662656 Branch: refs/heads/trunk Commit: 216626569a3a907a32410eb2e680c2f2dab163c3 Parents: c28d520 Author: gtully <[email protected]> Authored: Thu Jan 22 13:45:34 2015 +0000 Committer: gtully <[email protected]> Committed: Thu Jan 22 14:13:32 2015 +0000 ---------------------------------------------------------------------- .../activemq/bugs/TransactedStoreUsageSuspendResumeTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/21662656/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java index 1e95c61..3d32867 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/TransactedStoreUsageSuspendResumeTest.java @@ -30,6 +30,7 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.TestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; import org.junit.After; @@ -81,7 +82,7 @@ public class TransactedStoreUsageSuspendResumeTest { MessageConsumer consumer = session.createConsumer(session.createQueue(QUEUE_NAME)); do { - Message message = consumer.receive(1000); + Message message = consumer.receive(5000); if (message != null) { session.commit(); messagesReceivedCountDown.countDown(); @@ -140,7 +141,10 @@ public class TransactedStoreUsageSuspendResumeTest { sendExecutor.shutdown(); sendExecutor.awaitTermination(5, TimeUnit.MINUTES); - boolean allMessagesReceived = messagesReceivedCountDown.await(120, TimeUnit.SECONDS); + boolean allMessagesReceived = messagesReceivedCountDown.await(10, TimeUnit.MINUTES); + if (!allMessagesReceived) { + TestSupport.dumpAllThreads("StuckConsumer!"); + } assertTrue("Got all messages: " + messagesReceivedCountDown, allMessagesReceived); // give consumers a chance to exit gracefully
