Repository: samza Updated Branches: refs/heads/master 42c194040 -> 20fe6ec61
SAMZA-1487: Disable Flaky Zk Integration tests. Author: Shanthoosh Venkataraman <svenkatara...@linkedin.com> Reviewers: Yi Pan <nickpa...@gmail.com> Closes #355 from shanthoosh/master Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/20fe6ec6 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/20fe6ec6 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/20fe6ec6 Branch: refs/heads/master Commit: 20fe6ec6188a21c670b12bbfd1bc8f2f031a7b12 Parents: 42c1940 Author: Shanthoosh Venkataraman <svenkatara...@linkedin.com> Authored: Tue Nov 14 10:54:32 2017 -0800 Committer: Prateek Maheshwari <pmahe...@linkedin.com> Committed: Tue Nov 14 10:54:32 2017 -0800 ---------------------------------------------------------------------- .../zk/TestZkBarrierForVersionUpgrade.java | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/20fe6ec6/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java index 3dd1bd5..7689901 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkBarrierForVersionUpgrade.java @@ -23,18 +23,17 @@ import org.I0Itec.zkclient.ZkClient; import org.apache.samza.config.ZkConfig; import org.apache.samza.testUtils.EmbeddedZookeeper; import org.apache.samza.util.NoOpMetricsRegistry; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; - +//import org.junit.After; +//import org.junit.AfterClass; +//import org.junit.Before; +//import org.junit.BeforeClass; +//import org.junit.Test; // TODO: Rename this such that it is clear that it is an integration test and NOT unit test public class TestZkBarrierForVersionUpgrade { @@ -43,14 +42,14 @@ public class TestZkBarrierForVersionUpgrade { private ZkUtils zkUtils; private ZkUtils zkUtils1; - @BeforeClass + //@BeforeClass public static void test() { zkServer = new EmbeddedZookeeper(); zkServer.setup(); testZkConnectionString = "127.0.0.1:" + zkServer.getPort(); } - @Before + //@Before public void testSetup() { ZkClient zkClient = new ZkClient(testZkConnectionString, ZkConfig.DEFAULT_SESSION_TIMEOUT_MS, ZkConfig.DEFAULT_CONNECTION_TIMEOUT_MS); this.zkUtils = new ZkUtils(new ZkKeyBuilder("group1"), zkClient, ZkConfig.DEFAULT_CONNECTION_TIMEOUT_MS, new NoOpMetricsRegistry()); @@ -58,18 +57,18 @@ public class TestZkBarrierForVersionUpgrade { this.zkUtils1 = new ZkUtils(new ZkKeyBuilder("group1"), zkClient1, ZkConfig.DEFAULT_CONNECTION_TIMEOUT_MS, new NoOpMetricsRegistry()); } - @After + //@After public void testTearDown() { zkUtils.close(); zkUtils1.close(); } - @AfterClass + //@AfterClass public static void teardown() { zkServer.teardown(); } - @Test + //@Test public void testZkBarrierForVersionUpgrade() { String barrierId = zkUtils.getKeyBuilder().getRootPath() + "/b1"; String ver = "1"; @@ -140,7 +139,7 @@ public class TestZkBarrierForVersionUpgrade { Assert.assertEquals(2, stateChangedCalled.get()); } - @Test + //@Test public void testZkBarrierForVersionUpgradeWithTimeOut() { String barrierId = zkUtils1.getKeyBuilder().getRootPath() + "/barrierTimeout"; String ver = "1";
