From 5e04b3eb8698ba17bfbff81877de85894c52c6d3 Mon Sep 17 00:00:00 2001 From: Bogdan Kanivets Date: Thu, 17 May 2018 15:00:50 -0700 Subject: [PATCH] ZOOKEEPER-3046: added junit timeout to precede 'ant' timeout When 'ant' timeout triggers, output of the test isn't captured. Related issue ZOOKEEPER-2916. --- .../zookeeper/server/quorum/StandaloneDisabledTest.java | 6 +++++- .../org/apache/zookeeper/test/DisconnectedWatcherTest.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java b/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java index a50e98ae34f..b08bd238299 100644 --- a/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java +++ b/src/java/test/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java @@ -28,6 +28,7 @@ import org.apache.zookeeper.PortAssignment; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.admin.ZooKeeperAdmin; +import org.apache.zookeeper.client.FourLetterWordMain; import org.apache.zookeeper.test.ClientBase; import org.apache.zookeeper.test.ReconfigTest; import org.junit.Assert; @@ -52,7 +53,7 @@ public class StandaloneDisabledTest extends QuorumPeerTestBase { * Test normal quorum operations work cleanly * with just a single server. */ - @Test + @Test(timeout = 600000) public void startSingleServerTest() throws Exception { setUpData(); @@ -179,6 +180,9 @@ private void startServer(int id, String config) throws Exception { zkHandles[id] = ClientBase.createZKClient("127.0.0.1:" + clientPorts[id]); zkAdminHandles[id] = new ZooKeeperAdmin("127.0.0.1:" + clientPorts[id], CONNECTION_TIMEOUT, this); zkAdminHandles[id].addAuthInfo("digest", "super:test".getBytes()); + String statCommandOut = FourLetterWordMain.send4LetterWord("127.0.0.1", clientPorts[id], "stat"); + LOG.info(String.format("Started server id %d with config:\n%s\nStat output:\n%s", + id, config, statCommandOut)); } /** diff --git a/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java b/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java index cad38f03a33..017618ecba0 100644 --- a/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java +++ b/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java @@ -178,7 +178,7 @@ public void testDeepChildWatcherAutoResetWithChroot() throws Exception { // @see jira issue ZOOKEEPER-706. Test auto reset of a large number of // watches which require multiple SetWatches calls. - @Test + @Test(timeout = 600000) public void testManyChildWatchersAutoReset() throws Exception { ZooKeeper zk1 = createClient(); @@ -199,6 +199,7 @@ public void testManyChildWatchersAutoReset() throws Exception { CreateMode.PERSISTENT_SEQUENTIAL); paths.add(path); } + LOG.info("Created 10,000 nodes."); MyWatcher childWatcher = new MyWatcher();