Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B623D200CB7 for ; Fri, 30 Jun 2017 22:45:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B4C9B160BEB; Fri, 30 Jun 2017 20:45:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 06989160BE8 for ; Fri, 30 Jun 2017 22:45:34 +0200 (CEST) Received: (qmail 20340 invoked by uid 500); 30 Jun 2017 20:45:34 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 20329 invoked by uid 99); 30 Jun 2017 20:45:34 -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; Fri, 30 Jun 2017 20:45:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F2FB5DFE8B; Fri, 30 Jun 2017 20:45:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hanm@apache.org To: commits@zookeeper.apache.org Message-Id: <48f0043c4323423484717c65b01f31db@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2786: Flaky test: org.apache.zookeeper.test.ClientTest.testNonExistingOpCode Date: Fri, 30 Jun 2017 20:45:33 +0000 (UTC) archived-at: Fri, 30 Jun 2017 20:45:35 -0000 Repository: zookeeper Updated Branches: refs/heads/branch-3.4 677b5ccb7 -> 4638b5585 ZOOKEEPER-2786: Flaky test: org.apache.zookeeper.test.ClientTest.testNonExistingOpCode See https://github.com/apache/zookeeper/pull/286 for description. Author: Abraham Fine Reviewers: Michael Han Closes #287 from afine/ZOOKEEPER-2786_3.4_fix Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/4638b558 Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/4638b558 Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/4638b558 Branch: refs/heads/branch-3.4 Commit: 4638b5585210ecbd7e709989467cb179abd67080 Parents: 677b5cc Author: Abraham Fine Authored: Fri Jun 30 13:45:30 2017 -0700 Committer: Michael Han Committed: Fri Jun 30 13:45:30 2017 -0700 ---------------------------------------------------------------------- .../org/apache/zookeeper/test/ClientTest.java | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/4638b558/src/java/test/org/apache/zookeeper/test/ClientTest.java ---------------------------------------------------------------------- diff --git a/src/java/test/org/apache/zookeeper/test/ClientTest.java b/src/java/test/org/apache/zookeeper/test/ClientTest.java index 7b2d19a..9dc4861 100644 --- a/src/java/test/org/apache/zookeeper/test/ClientTest.java +++ b/src/java/test/org/apache/zookeeper/test/ClientTest.java @@ -18,12 +18,11 @@ package org.apache.zookeeper.test; -import static org.junit.Assert.fail; - import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -33,6 +32,7 @@ import org.apache.zookeeper.KeeperException.Code; import org.apache.zookeeper.KeeperException.InvalidACLException; import org.apache.zookeeper.TestableZooKeeper; import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.Watcher; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.Watcher.Event.KeeperState; import org.apache.zookeeper.ZooDefs.Ids; @@ -774,8 +774,16 @@ public class ClientTest extends ClientBase { */ @Test public void testNonExistingOpCode() throws Exception { - CountdownWatcher watcher = new CountdownWatcher(); - TestableZooKeeper zk = createClient(watcher); + final CountDownLatch clientDisconnected = new CountDownLatch(1); + Watcher watcher = new Watcher() { + @Override + public synchronized void process(WatchedEvent event) { + if (event.getState() == KeeperState.Disconnected) { + clientDisconnected.countDown(); + } + } + }; + TestableZooKeeper zk = new TestableZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher); final String path = "/m1"; @@ -785,10 +793,13 @@ public class ClientTest extends ClientBase { request.setPath(path); request.setWatch(false); ExistsResponse response = new ExistsResponse(); + ReplyHeader r = zk.submitRequest(h, request, response, null); + Assert.assertEquals(r.getErr(), Code.UNIMPLEMENTED.intValue()); // Sending a nonexisting opcode should cause the server to disconnect - watcher.waitForDisconnected(5000); + Assert.assertTrue("failed to disconnect", + clientDisconnected.await(5000, TimeUnit.MILLISECONDS)); } }