From 55fcafc08e9267f22c55a05be3d31bc9d4586a97 Mon Sep 17 00:00:00 2001 From: Ben Lau Date: Tue, 27 Feb 2018 16:53:42 -0800 Subject: [PATCH] HBASE-19989 Addendum - temp override for tests to be added later for HBASE-20001 --- .../hadoop/hbase/regionserver/TestZKLessMergeOnCluster.java | 7 +++++++ .../hadoop/hbase/regionserver/TestZKLessSplitOnCluster.java | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 4900af8379..a09dd1c67c 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 + } } 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 1201c0115f..b6b489cf20 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 + } } - -- 2.14.3 (Apple Git-98)