Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
This commit is contained in:
Sean Busbey 2015-04-06 16:15:30 -05:00 committed by Sean Busbey
parent 3f8780e153
commit 7469426d64
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
View File

@ -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");