Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 64587 invoked from network); 1 Apr 2008 16:02:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2008 16:02:46 -0000 Received: (qmail 46918 invoked by uid 500); 1 Apr 2008 16:02:46 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 46899 invoked by uid 500); 1 Apr 2008 16:02:46 -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 46890 invoked by uid 99); 1 Apr 2008 16:02:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 09:02:46 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 16:02:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E5741A9832; Tue, 1 Apr 2008 09:02:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643461 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java Date: Tue, 01 Apr 2008 16:02:23 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080401160223.8E5741A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Tue Apr 1 09:02:19 2008 New Revision: 643461 URL: http://svn.apache.org/viewvc?rev=643461&view=rev Log: Wait for the queue consumers to connect before sending the messages. Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java?rev=643461&r1=643460&r2=643461&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/MultiBrokersMultiClientsTest.java Tue Apr 1 09:02:19 2008 @@ -35,7 +35,7 @@ public static final int BROKER_COUNT = 2; // number of brokers to network public static final int CONSUMER_COUNT = 3; // consumers per broker public static final int PRODUCER_COUNT = 3; // producers per broker - public static final int MESSAGE_COUNT = 10; // messages per producer + public static final int MESSAGE_COUNT = 20; // messages per producer protected Map consumerMap; @@ -68,7 +68,7 @@ } } - assertTrue("Missing " + latch.getCount() + " messages", latch.await(30, TimeUnit.SECONDS)); + assertTrue("Missing " + latch.getCount() + " messages", latch.await(45, TimeUnit.SECONDS)); // Get message count for (int i = 1; i <= BROKER_COUNT; i++) { @@ -97,7 +97,10 @@ } // wait for consumers to get propagated - Thread.sleep(5000); + for (int i = 1; i <= BROKER_COUNT; i++) { + // all consumers on the remote brokers look like 1 consumer to the local broker. + assertConsumersConnect("Broker" + i, dest, (BROKER_COUNT-1)+CONSUMER_COUNT, 30000); + } // Send messages for (int i = 1; i <= BROKER_COUNT; i++) { @@ -107,7 +110,7 @@ } // Wait for messages to be delivered - assertTrue("Missing " + latch.getCount() + " messages", latch.await(30, TimeUnit.SECONDS)); + assertTrue("Missing " + latch.getCount() + " messages", latch.await(45, TimeUnit.SECONDS)); // Get message count int totalMsg = 0;