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

Revert "Amend HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4" 

This reverts commit aa7c93c659.
This commit is contained in:
Andrew Purtell 2017-09-15 10:19:22 -07:00
parent 862a717e37
commit 469d6bf457
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
View File

@ -120,7 +120,6 @@ public class TestCanaryTool {
@Test
public void testReadTableTimeouts() throws Exception {
if (skipOldJREs()) return;
final TableName [] tableNames = new TableName[2];
tableNames[0] = TableName.valueOf("testReadTableTimeouts1");
tableNames[1] = TableName.valueOf("testReadTableTimeouts2");
@ -164,7 +163,6 @@ public class TestCanaryTool {
@Test
public void testWriteTableTimeout() throws Exception {
if (skipOldJREs()) return;
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());
Canary canary = new Canary(executor, sink);
@ -183,7 +181,6 @@ public class TestCanaryTool {
//no table created, so there should be no regions
@Test
public void testRegionserverNoRegions() throws Exception {
if (skipOldJREs()) return;
runRegionserverCanary();
verify(mockAppender).doAppend(argThat(new ArgumentMatcher<LoggingEvent>() {
@Override
@ -196,7 +193,6 @@ public class TestCanaryTool {
//by creating a table, there shouldn't be any region servers not serving any regions
@Test
public void testRegionserverWithRegions() throws Exception {
if (skipOldJREs()) return;
TableName tableName = TableName.valueOf("testTable");
testingUtility.createTable(tableName, new byte[][] { FAMILY });
runRegionserverCanary();
@ -231,15 +227,6 @@ public class TestCanaryTool {
assertEquals("verify no read error count", 0, canary.getReadFailures().size());
}
// We have unexpected trouble asserting with custom matchers using Mockito on Java < 8,
// so skip the relevant tests if running on an older JRE.
private static boolean skipOldJREs() {
String specVersion[] = System.getProperty("java.specification.version").split("\\.");
int majorVersion = Integer.valueOf(specVersion[0]);
int minorVersion = Integer.valueOf(specVersion[1]);
return !(majorVersion > 1 || (majorVersion == 1 && minorVersion > 7));
}
private void runRegionserverCanary() throws Exception {
ExecutorService executor = new ScheduledThreadPoolExecutor(1);
Canary canary = new Canary(executor, new Canary.RegionServerStdOutSink());