Repository: hbase Updated Branches: refs/heads/branch-2 34d5f2b70 -> 8be069632
HBASE-20014 TestAdmin1 Times out Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8be06963 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8be06963 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8be06963 Branch: refs/heads/branch-2 Commit: 8be0696320e4923d348c07c027a9e5080995b0a8 Parents: 34d5f2b Author: Michael Stack <st...@apache.org> Authored: Fri Feb 16 20:55:29 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Fri Feb 16 20:55:29 2018 -0800 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java | 2 +- src/main/asciidoc/_chapters/developer.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8be06963/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java ---------------------------------------------------------------------- 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 d47b213..a41e383 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( http://git-wip-us.apache.org/repos/asf/hbase/blob/8be06963/src/main/asciidoc/_chapters/developer.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index a15d358..0cd6ad9 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -1000,7 +1000,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
