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 A741417A52 for ; Tue, 31 Mar 2015 15:32:37 +0000 (UTC) Received: (qmail 71606 invoked by uid 500); 31 Mar 2015 15:24:59 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 71474 invoked by uid 500); 31 Mar 2015 15:24:59 -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 71381 invoked by uid 99); 31 Mar 2015 15:24:59 -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; Tue, 31 Mar 2015 15:24:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53C82E10A7; Tue, 31 Mar 2015 15:24:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 31 Mar 2015 15:25:01 -0000 Message-Id: In-Reply-To: <441d46e70153406baa198245b69b2167@git.apache.org> References: <441d46e70153406baa198245b69b2167@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] activemq-6 git commit: Improving a test that failed due to what seemed a race Improving a test that failed due to what seemed a race Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/2f819a63 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/2f819a63 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/2f819a63 Branch: refs/heads/master Commit: 2f819a63e7afa734d096156277358933c3311c45 Parents: 519a47f Author: Clebert Suconic Authored: Mon Mar 16 19:17:52 2015 -0400 Committer: Clebert Suconic Committed: Tue Mar 31 11:23:06 2015 -0400 ---------------------------------------------------------------------- .../activemq/tests/unit/core/server/impl/QueueImplTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2f819a63/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java index 8286ab6..3be1f61 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/server/impl/QueueImplTest.java @@ -625,8 +625,13 @@ public class QueueImplTest extends UnitTestCase queue.resume(); // Need to make sure the consumers will receive the messages before we do these assertions - long timeout = System.currentTimeMillis() + 1000; - while (cons1.getReferences().size() != numMessages / 2 && cons2.getReferences().size() != numMessages / 2 && timeout > System.currentTimeMillis()) + long timeout = System.currentTimeMillis() + 5000; + while (cons1.getReferences().size() != numMessages / 2 && timeout > System.currentTimeMillis()) + { + Thread.sleep(1); + } + + while (cons2.getReferences().size() != numMessages / 2 && timeout > System.currentTimeMillis()) { Thread.sleep(1); }