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 6C4CB18C96 for ; Sun, 11 Oct 2015 15:45:53 +0000 (UTC) Received: (qmail 78626 invoked by uid 500); 11 Oct 2015 15:45:44 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 78597 invoked by uid 500); 11 Oct 2015 15:45:43 -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 78588 invoked by uid 99); 11 Oct 2015 15:45:43 -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, 11 Oct 2015 15:45:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C024FDFF1B; Sun, 11 Oct 2015 15:45:43 +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: <710a830673374704984cd4078dc67a4e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: curator git commit: Don't fail on unexpected event. It's not actually a failure Date: Sun, 11 Oct 2015 15:45:43 +0000 (UTC) Repository: curator Updated Branches: refs/heads/CURATOR-3.0 a0cb3fa7f -> b7cfbb64a Don't fail on unexpected event. It's not actually a failure Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b7cfbb64 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b7cfbb64 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b7cfbb64 Branch: refs/heads/CURATOR-3.0 Commit: b7cfbb64a10526a612f87a00f62e32d08b5da411 Parents: a0cb3fa Author: randgalt Authored: Sun Oct 11 10:45:39 2015 -0500 Committer: randgalt Committed: Sun Oct 11 10:45:39 2015 -0500 ---------------------------------------------------------------------- .../framework/recipes/nodes/TestPersistentEphemeralNode.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b7cfbb64/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 fe2dd93..7b43dca 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 @@ -40,6 +40,8 @@ import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -56,6 +58,7 @@ import static org.testng.Assert.*; public class TestPersistentEphemeralNode extends BaseClassForTests { + private static final Logger log = LoggerFactory.getLogger(TestPersistentEphemeralNode.class); private static final String DIR = "/test"; private static final String PATH = ZKPaths.makePath(DIR, "/foo"); @@ -705,7 +708,7 @@ public class TestPersistentEphemeralNode extends BaseClassForTests } else if ( type != EventType.None ) { - Assert.fail("Unexpected watcher event: " + event); + log.warn("Unexpected watcher event: " + event); } }