Repository: hbase Updated Branches: refs/heads/branch-2 3a02a2a80 -> a9fcd9586 refs/heads/master 5f238b3ef -> 11d749527
HBASE-18813 TestCanaryTool fails on branch-1 / branch-1.4 Disable units where argument matching is intermittently failing Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a9fcd958 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a9fcd958 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a9fcd958 Branch: refs/heads/branch-2 Commit: a9fcd95860ff2b2f08e1bbb54ad0156796e8460d Parents: 3a02a2a Author: Andrew Purtell <apurt...@apache.org> Authored: Fri Sep 15 10:24:05 2017 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Sep 22 09:48:02 2017 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a9fcd958/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index ba77035..190d5a9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.shaded.com.google.common.collect.Iterables; import org.junit.After; import org.junit.Before; import org.junit.Rule; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; @@ -119,6 +120,7 @@ public class TestCanaryTool { } @Test + @Ignore("Intermittent argument matching failures, see HBASE-18813") public void testReadTableTimeouts() throws Exception { final TableName [] tableNames = new TableName[2]; tableNames[0] = TableName.valueOf(name.getMethodName() + "1"); @@ -162,6 +164,7 @@ public class TestCanaryTool { } @Test + @Ignore("Intermittent argument matching failures, see HBASE-18813") public void testWriteTableTimeout() throws Exception { ExecutorService executor = new ScheduledThreadPoolExecutor(1); Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink());