Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2C74177E9 for ; Wed, 8 Apr 2015 19:37:59 +0000 (UTC) Received: (qmail 95345 invoked by uid 500); 8 Apr 2015 19:37:59 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 95297 invoked by uid 500); 8 Apr 2015 19:37:59 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 95288 invoked by uid 99); 8 Apr 2015 19:37:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 19:37:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4632E10FD; Wed, 8 Apr 2015 19:37:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13414 Removes now-obselete checks for JRE 6 in TestHCM. Date: Wed, 8 Apr 2015 19:37:59 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 3f8780e15 -> 7469426d6 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/7469426d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7469426d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7469426d Branch: refs/heads/branch-1 Commit: 7469426d644de951778a7f6b14de12a4f9e3bde0 Parents: 3f8780e Author: Sean Busbey Authored: Mon Apr 6 16:15:30 2015 -0500 Committer: Sean Busbey Committed: Wed Apr 8 14:32:27 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/7469426d/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 64d3988..233e36b 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"); @@ -474,10 +463,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");