From 969895105c77aaa34f4678d1924e83ebda7edb0f Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Fri, 16 Feb 2018 20:55:29 -0800 Subject: [PATCH] HBASE-20014 TestAdmin1 Times out --- .../test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java | 2 +- src/main/asciidoc/_chapters/developer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java index d47b21359e0..a41e3837956 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java @@ -61,7 +61,7 @@ public final class HBaseClassTestRule implements TestRule { for (Class c : categories[0].value()) { if (c == SmallTests.class || c == MediumTests.class || c == LargeTests.class) { // All tests have a 10minute timeout. - return TimeUnit.MINUTES.toSeconds(10); + return TimeUnit.MINUTES.toSeconds(13); } } throw new IllegalArgumentException( diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 3d8275ff933..3dbfe743b27 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -999,7 +999,7 @@ is that of the local test; i.e. in the TestTimeout Test Class, you'd pass `TestTimeout.class` to the `CLASS_RULE` instead of the `TestHRegionInfo.class` we have above. The `CLASS_RULE` is where we'll enforce timeouts (currently set at a hard-limit of -ten minutes for all tests) and other cross-unit test facility. +thirteen! minutes for all tests -- 780 seconds) and other cross-unit test facility. The test is in the `SmallTest` Category. Categories can be arbitrary and provided as a list but each test MUST