Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 18268 invoked from network); 17 Feb 2011 18:28:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Feb 2011 18:28:17 -0000 Received: (qmail 99728 invoked by uid 500); 17 Feb 2011 18:28:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 99662 invoked by uid 500); 17 Feb 2011 18:28:16 -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 99655 invoked by uid 99); 17 Feb 2011 18:28:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 18:28:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 17 Feb 2011 18:28:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED7EC23888CF; Thu, 17 Feb 2011 18:27:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071737 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover: FailoverTransactionTest.java FailoverTransportBrokerTest.java Date: Thu, 17 Feb 2011 18:27:54 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110217182754.ED7EC23888CF@eris.apache.org> Author: gtully Date: Thu Feb 17 18:27:54 2011 New Revision: 1071737 URL: http://svn.apache.org/viewvc?rev=1071737&view=rev Log: don't use MEM store for transaction recovery tests Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java?rev=1071737&r1=1071736&r2=1071737&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java Thu Feb 17 18:27:54 2011 @@ -123,7 +123,8 @@ public class FailoverTransactionTest ext } public void initCombosForTestFailoverCommitReplyLost() { - addCombinationValues("defaultPersistenceAdapter", PersistenceAdapterChoice.values()); + addCombinationValues("defaultPersistenceAdapter", + new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.AMQ, PersistenceAdapterChoice.JDBC}); } public void testFailoverCommitReplyLost() throws Exception { Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java?rev=1071737&r1=1071736&r2=1071737&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java Thu Feb 17 18:27:54 2011 @@ -145,9 +145,10 @@ public class FailoverTransportBrokerTest }); c.start(); int count = 0; - while(count++ < 5 && info[0] == null) { + while(count++ < 20 && info[0] == null) { TimeUnit.SECONDS.sleep(1); } + assertNotNull("got a valid brokerInfo after 20 secs", info[0]); assertNull("no peer brokers present", info[0].getPeerBrokerInfos()); }