hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject hbase git commit: HBASE-13414 Removes now-obselete checks for JRE 6 in TestHCM.
Date Wed, 08 Apr 2015 19:43:26 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 6fe572740 -> b66df5e96


HBASE-13414 Removes now-obselete checks for JRE 6 in TestHCM.

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b66df5e9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b66df5e9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b66df5e9

Branch: refs/heads/branch-1.0
Commit: b66df5e9672ba9d7e12358674ab8b2c97fffb749
Parents: 6fe5727
Author: Sean Busbey <busbey@apache.org>
Authored: Mon Apr 6 16:15:30 2015 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Wed Apr 8 14:38:20 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/b66df5e9/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 1a7866f..306e139 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
@@ -76,7 +76,6 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hbase.util.ManualEnvironmentEdge;
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
-import org.jboss.netty.util.internal.DetectionUtil;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -108,8 +107,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.
 */
@@ -131,11 +128,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);
   }
 
@@ -223,10 +216,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");
@@ -475,10 +464,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");
 


Mime
View raw message