You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/02/28 01:46:42 UTC
hbase git commit: HBASE-19989 Addendum - temp override for tests to
be added later for HBASE-20001
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 d71042620 -> d74f8f019
HBASE-19989 Addendum - temp override for tests to be added later for HBASE-20001
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d74f8f01
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d74f8f01
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d74f8f01
Branch: refs/heads/branch-1.3
Commit: d74f8f019b76814ef9c99c2850d2f040e9bd9222
Parents: d710426
Author: Ben Lau <be...@oath.com>
Authored: Tue Feb 27 16:53:42 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 27 17:44:28 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/d74f8f01/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/d74f8f01/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
+ }
}
-