You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2015/04/08 21:30:22 UTC
hbase git commit: HBASE-13414 Removes now-obselete checks for JRE 6
in TestHCM.
Repository: hbase
Updated Branches:
refs/heads/master 8cd3001f8 -> cbc53a0ba
HBASE-13414 Removes now-obselete checks for JRE 6 in TestHCM.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cbc53a0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cbc53a0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cbc53a0b
Branch: refs/heads/master
Commit: cbc53a0ba58f32de54614cdfaa8acc0c1b92786a
Parents: 8cd3001
Author: Sean Busbey <bu...@apache.org>
Authored: Mon Apr 6 16:15:30 2015 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Apr 8 14:21:28 2015 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/TestHCM.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/cbc53a0b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
index 64bde1d..9ed5be6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
@@ -69,7 +69,6 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.ManualEnvironmentEdge;
import org.apache.hadoop.hbase.util.Threads;
-import org.jboss.netty.util.internal.DetectionUtil;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -101,8 +100,6 @@ public class TestHCM {
private static final byte[] ROW_X = Bytes.toBytes("xxx");
private static Random _randy = new Random();
- private static boolean isJavaOk = DetectionUtil.javaVersion() > 6;
-
/**
* This copro sleeps 20 second. The first call it fails. The second time, it works.
*/
@@ -124,11 +121,7 @@ public class TestHCM {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- TEST_UTIL.getConfiguration().setBoolean(HConstants.STATUS_PUBLISHED,
- HConstants.STATUS_PUBLISHED_DEFAULT);
- if (isJavaOk) {
- TEST_UTIL.getConfiguration().setBoolean(HConstants.STATUS_PUBLISHED, true);
- }
+ TEST_UTIL.getConfiguration().setBoolean(HConstants.STATUS_PUBLISHED, true);
TEST_UTIL.startMiniCluster(2);
}
@@ -211,10 +204,6 @@ public class TestHCM {
// Fails too often! Needs work. HBASE-12558
@Ignore @Test(expected = RegionServerStoppedException.class)
public void testClusterStatus() throws Exception {
- if (!isJavaOk){
- // This test requires jdk 1.7+
- throw new RegionServerStoppedException("as expected by the test...");
- }
TableName tn =
TableName.valueOf("testClusterStatus");
@@ -467,10 +456,6 @@ public class TestHCM {
*/
@Test
public void testConnectionCut() throws Exception {
- if (!isJavaOk){
- // This test requires jdk 1.7+
- return;
- }
TableName tableName = TableName.valueOf("HCM-testConnectionCut");