Repository: hbase Updated Branches: refs/heads/branch-2 8f1e01b6e -> c93ba37df
HBASE-19956 Remove category as a consideration timing out tests; set all test to timeout at 10minutes regardless Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c93ba37d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c93ba37d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c93ba37d Branch: refs/heads/branch-2 Commit: c93ba37dfc672da078bbceb4a3d2c6238a639882 Parents: 8f1e01b Author: Michael Stack <st...@apache.org> Authored: Wed Feb 7 19:27:49 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Wed Feb 7 20:10:36 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/HBaseClassTestRule.java | 15 ++------------- hbase-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c93ba37d/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 734ce3f..bcde826 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 @@ -57,20 +57,9 @@ public final class HBaseClassTestRule implements TestRule { private static long getTimeoutInSeconds(Class<?> clazz) { Category[] categories = clazz.getAnnotationsByType(Category.class); - if (categories.length == 0) { - throw new IllegalArgumentException(clazz.getName() + " is not annotated with @Category"); - } for (Class<?> c : categories[0].value()) { - if (c == SmallTests.class) { - // See SmallTests. Supposed to run 15 seconds. - // Lots of these timeout on Jenkins... a stall of ten or twenty seconds mess up what looks - // fine when run local. - return 60; - } else if (c == MediumTests.class) { - // See MediumTests. Supposed to run 50 seconds. - return 180; - } else if (c == LargeTests.class) { - // Let large tests have a ten minute timeout. + if (c == SmallTests.class || c == MediumTests.class || c == LargeTests.class) { + // All tests have a 10minute timeout. return TimeUnit.MINUTES.toSeconds(10); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/c93ba37d/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 6c06acf..1bc48bc 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -36,7 +36,7 @@ <license.bundles.jquery>true</license.bundles.jquery> </properties> <build> - <!-- Makes sure the resources get added before they are processed + <!-- Make sure resources get added before they are processed by placing this first --> <resources> <!-- Add the build webabpps to the classpth -->
