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 5184A1083E for ; Tue, 8 Sep 2015 18:00:39 +0000 (UTC) Received: (qmail 74807 invoked by uid 500); 8 Sep 2015 18:00:17 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 74777 invoked by uid 500); 8 Sep 2015 18:00:17 -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 74768 invoked by uid 99); 8 Sep 2015 18:00:17 -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, 08 Sep 2015 18:00:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5204DE0664; Tue, 8 Sep 2015 18:00:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: curator git commit: Use forSessionSleep after session killed Date: Tue, 8 Sep 2015 18:00:17 +0000 (UTC) Repository: curator Updated Branches: refs/heads/CURATOR-3.0 95278759b -> 48824ebe0 Use forSessionSleep after session killed Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/48824ebe Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/48824ebe Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/48824ebe Branch: refs/heads/CURATOR-3.0 Commit: 48824ebe0df4f384fdb1542d0d9768798c33c058 Parents: 9527875 Author: randgalt Authored: Tue Sep 8 13:00:09 2015 -0500 Committer: randgalt Committed: Tue Sep 8 13:00:09 2015 -0500 ---------------------------------------------------------------------- .../framework/recipes/nodes/TestPersistentEphemeralNode.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/48824ebe/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java index 3a0d564..e182ec0 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java @@ -311,7 +311,7 @@ public class TestPersistentEphemeralNode extends BaseClassForTests KillSession.kill(curator.getZookeeperClient().getZooKeeper()); // Make sure the node got deleted - assertTrue(deletedTrigger.firedWithin(timing.forWaiting().seconds(), TimeUnit.SECONDS)); + assertTrue(deletedTrigger.firedWithin(timing.forSessionSleep().seconds(), TimeUnit.SECONDS)); node.debugReconnectLatch.countDown(); } finally @@ -340,7 +340,7 @@ public class TestPersistentEphemeralNode extends BaseClassForTests KillSession.kill(curator.getZookeeperClient().getZooKeeper()); // Make sure the node got deleted... - assertTrue(deletedTrigger.firedWithin(timing.forWaiting().seconds(), TimeUnit.SECONDS)); + assertTrue(deletedTrigger.firedWithin(timing.forSessionSleep().seconds(), TimeUnit.SECONDS)); node.debugReconnectLatch.countDown(); // Check for it to be recreated... @@ -379,7 +379,7 @@ public class TestPersistentEphemeralNode extends BaseClassForTests KillSession.kill(curator.getZookeeperClient().getZooKeeper()); // Make sure the node ended up getting deleted... - assertTrue(deletionTrigger.firedWithin(timing.forWaiting().seconds(), TimeUnit.SECONDS)); + assertTrue(deletionTrigger.firedWithin(timing.forSessionSleep().seconds(), TimeUnit.SECONDS)); node.debugReconnectLatch.countDown(); // Now put a watch in the background looking to see if it gets created...