You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2017/05/23 00:58:37 UTC
[2/6] samza git commit: SAMZA-1193. re-enable the test
TestZkBarrierForVersionUpgrade.testZkBarrierForVersionUpgrade
SAMZA-1193. re-enable the test TestZkBarrierForVersionUpgrade.testZkBarrierForVersionUpgrade
The code changed significantly. I've rerun the test multiple times both with gradle and intelij. It passed every time. I suggest we enable it back.
Author: Boris Shkolnik <bo...@apache.org>
Reviewers: Xinyu Liu <xi...@apache.org>
Closes #181 from sborya/testZkBarrierForVersionUpgrade
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/3054e532
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/3054e532
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/3054e532
Branch: refs/heads/0.13.0
Commit: 3054e5322a0c4973f33ef32149d31a0ae5b713b9
Parents: 4011459
Author: Boris Shkolnik <bo...@apache.org>
Authored: Fri May 19 17:25:26 2017 -0700
Committer: Xinyu Liu <xi...@xiliu-ld.linkedin.biz>
Committed: Mon May 22 17:56:21 2017 -0700
----------------------------------------------------------------------
.../zk/TestZkBarrierForVersionUpgrade.java | 31 ++++++++------------
1 file changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/3054e532/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 f1bb804..547e32b 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
@@ -18,6 +18,11 @@
*/
package org.apache.samza.zk;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.Assert;
import org.apache.samza.config.Config;
import org.apache.samza.config.MapConfig;
@@ -27,33 +32,26 @@ import org.apache.samza.coordinator.CoordinationServiceFactory;
import org.apache.samza.coordinator.CoordinationUtils;
import org.apache.samza.testUtils.EmbeddedZookeeper;
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.HashMap;
-import java.util.List;
-import java.util.Map;
-
public class TestZkBarrierForVersionUpgrade {
private static EmbeddedZookeeper zkServer = null;
private static String testZkConnectionString = null;
private static CoordinationUtils coordinationUtils;
+ private static AtomicInteger counter = new AtomicInteger(1);
+
+
+ @Before
+ public void testSetup() {
- @BeforeClass
- public static void setup() throws InterruptedException {
zkServer = new EmbeddedZookeeper();
zkServer.setup();
testZkConnectionString = "127.0.0.1:" + zkServer.getPort();
- }
- @Before
- public void testSetup() {
- String groupId = "group1";
+ String groupId = "group" + counter.getAndAdd(1);
String processorId = "p1";
Map<String, String> map = new HashMap<>();
map.put(ZkConfig.ZK_CONNECT, testZkConnectionString);
@@ -67,15 +65,10 @@ public class TestZkBarrierForVersionUpgrade {
@After
public void testTearDown() {
coordinationUtils.reset();
- }
-
- @AfterClass
- public static void teardown() {
zkServer.teardown();
}
- // TODO: SAMZA-1193 fix the following flaky test and re-enable it
- // @Test
+ @Test
public void testZkBarrierForVersionUpgrade() {
String barrierId = "b1";
String ver = "1";