Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 143 invoked from network); 22 Jul 2009 11:29:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jul 2009 11:29:14 -0000 Received: (qmail 60714 invoked by uid 500); 22 Jul 2009 11:30:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 60687 invoked by uid 500); 22 Jul 2009 11:30:19 -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 60678 invoked by uid 99); 22 Jul 2009 11:30:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2009 11:30:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2009 11:30:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30C4C23888A0; Wed, 22 Jul 2009 11:29:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r796673 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Date: Wed, 22 Jul 2009 11:29:57 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090722112957.30C4C23888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Wed Jul 22 11:29:56 2009 New Revision: 796673 URL: http://svn.apache.org/viewvc?rev=796673&view=rev Log: ensure a hang does not block full test run to determine if hang can be isolated Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java?rev=796673&r1=796672&r2=796673&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Wed Jul 22 11:29:56 2009 @@ -37,16 +37,15 @@ import javax.jms.TemporaryQueue; import javax.jms.TextMessage; -import junit.framework.TestCase; - import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.CombinationTestSupport; import org.apache.activemq.RedeliveryPolicy; import org.apache.activemq.broker.BrokerService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public class AMQ2102Test extends TestCase implements UncaughtExceptionHandler { +public class AMQ2102Test extends CombinationTestSupport implements UncaughtExceptionHandler { final static int MESSAGE_COUNT = 12120; final static int NUM_CONSUMERS = 10; @@ -442,7 +441,7 @@ String masterUrl; public void setUp() throws Exception { - + setAutoFail(true); master.setBrokerName("Master"); master.addConnector("tcp://localhost:0"); master.deleteAllMessages();