Repository: hbase Updated Branches: refs/heads/branch-1.4 a3ba4d53d -> 2caa9e838
HBASE-19989 Addendum - temp override for tests to be added later for HBASE-20001 Signed-off-by: Andrew Purtell <apurt...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7b1e733a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7b1e733a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7b1e733a Branch: refs/heads/branch-1.4 Commit: 7b1e733abff21dfd421b930a9e1cb1fa5c763335 Parents: a3ba4d5 Author: Ben Lau <ben...@oath.com> Authored: Tue Feb 27 16:53:42 2018 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Tue Feb 27 17:12:37 2018 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java | 7 +++++++ .../hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7b1e733a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java index 4900af8..a09dd1c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Test; import org.junit.experimental.categories.Category; /** @@ -42,4 +43,10 @@ public class TestZKLessMergeOnCluster extends TestRegionMergeTransactionOnCluste public static void afterAllTests() throws Exception { TestRegionMergeTransactionOnCluster.afterAllTests(); } + + @Test (timeout = 60000) + @Override + public void testMergeIsRolledBackOnMergeFailure() throws Exception { + // TODO: This test will be added later + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/7b1e733a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java index 1201c01..b6b489c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Test; import org.junit.experimental.categories.Category; /** @@ -41,5 +42,10 @@ public class TestZKLessSplitOnCluster extends TestSplitTransactionOnCluster { public static void after() throws Exception { TestSplitTransactionOnCluster.after(); } + + @Override + @Test (timeout = 60000) + public void testSplitIsRolledBackOnSplitFailure() throws Exception { + // TODO: This test will be added later + } } -
