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 E50B1172E5 for ; Thu, 22 Jan 2015 14:14:11 +0000 (UTC) Received: (qmail 30730 invoked by uid 500); 22 Jan 2015 14:14:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 30685 invoked by uid 500); 22 Jan 2015 14:14:11 -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 30672 invoked by uid 99); 22 Jan 2015 14:14:11 -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, 22 Jan 2015 14:14:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2526FE03ED; Thu, 22 Jan 2015 14:14:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Date: Thu, 22 Jan 2015 14:14:13 -0000 Message-Id: <29092947eb7a48eaa06ee3c28b16417d@git.apache.org> In-Reply-To: <4ad985a13d73432bb0c0e616ee65054e@git.apache.org> References: <4ad985a13d73432bb0c0e616ee65054e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] activemq git commit: this test can take more than 2mins in ci env, adding some more diagnostics and giving it more time 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 Authored: Thu Jan 22 13:45:34 2015 +0000 Committer: gtully 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