Repository: hbase Updated Branches: refs/heads/branch-1.2 20800f899 -> bd831fc20
HBASE-19546 TestMasterReplication.testCyclicReplication2 uses wrong assertion Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd831fc2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd831fc2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd831fc2 Branch: refs/heads/branch-1.2 Commit: bd831fc20e225b32361e08303b7906d5a9b9cd27 Parents: 20800f8 Author: zhangduo <[email protected]> Authored: Mon Dec 18 16:56:43 2017 +0800 Committer: zhangduo <[email protected]> Committed: Mon Dec 18 19:59:57 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/replication/TestMasterReplication.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bd831fc2/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java index 46b37d2..164cd7a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java @@ -1,4 +1,4 @@ -/* +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,6 +22,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import com.google.protobuf.ServiceException; + import java.io.Closeable; import java.io.IOException; import java.util.Arrays; @@ -75,8 +77,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.google.protobuf.ServiceException; - @Category(LargeTests.class) public class TestMasterReplication { @@ -217,7 +217,7 @@ public class TestMasterReplication { */ @Test(timeout = 300000) public void testCyclicReplication2() throws Exception { - LOG.info("testCyclicReplication1"); + LOG.info("testCyclicReplication2"); int numClusters = 3; Table[] htables = null; try { @@ -256,7 +256,7 @@ public class TestMasterReplication { // without HBASE-9158 the edit for row4 would have been marked with // cluster 0's id // and hence not replicated to cluster 0 - wait(row4, htables[0], true); + wait(row4, htables[0], false); } finally { close(htables); shutDownMiniClusters();
