Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A8C51783D for ; Sun, 23 Aug 2015 04:40:32 +0000 (UTC) Received: (qmail 87845 invoked by uid 500); 23 Aug 2015 04:40:32 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 87768 invoked by uid 500); 23 Aug 2015 04:40:32 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 87681 invoked by uid 99); 23 Aug 2015 04:40:32 -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; Sun, 23 Aug 2015 04:40:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5D33E04D8; Sun, 23 Aug 2015 04:40:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Sun, 23 Aug 2015 04:40:31 -0000 Message-Id: <818589d8e3664d87899d30a663a42509@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/7] curator git commit: testRequeuingWithLock was too dependent on timing. Created a better way to test the condition Repository: curator Updated Branches: refs/heads/CURATOR-214 af369dec7 -> 6c5a154c8 testRequeuingWithLock was too dependent on timing. Created a better way to test the condition Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/2a39a45d Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/2a39a45d Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/2a39a45d Branch: refs/heads/CURATOR-214 Commit: 2a39a45d48dd9e581276ee22dbe6e036063122b4 Parents: e8aff9a Author: randgalt Authored: Fri Aug 21 12:33:59 2015 -0500 Committer: randgalt Committed: Fri Aug 21 12:33:59 2015 -0500 ---------------------------------------------------------------------- .../framework/recipes/queue/DistributedIdQueue.java | 15 +++++++++++++++ .../recipes/queue/TestDistributedIdQueue.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/2a39a45d/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedIdQueue.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedIdQueue.java b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedIdQueue.java index a83fa36..dbd8e6e 100644 --- a/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedIdQueue.java +++ b/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedIdQueue.java @@ -18,6 +18,7 @@ */ package org.apache.curator.framework.recipes.queue; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.listen.ListenerContainer; @@ -183,6 +184,20 @@ public class DistributedIdQueue implements QueueBase return count; } + @VisibleForTesting + boolean debugIsQueued(String id) throws Exception + { + for ( String name : queue.getChildren() ) + { + if ( parseId(name).id.equals(id) ) + { + return true; + } + } + + return false; + } + private void internalSortChildren(List children) { Collections.sort http://git-wip-us.apache.org/repos/asf/curator/blob/2a39a45d/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedIdQueue.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedIdQueue.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedIdQueue.java index 858086b..24f74a1 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedIdQueue.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestDistributedIdQueue.java @@ -162,7 +162,7 @@ public class TestDistributedIdQueue extends BaseClassForTests Thread.sleep(1000); - Assert.assertEquals(queue.remove("id"), 1); + Assert.assertTrue(queue.debugIsQueued("id")); } finally