You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/02/08 08:57:26 UTC
[10/18] hbase git commit: HBASE-19956 Remove category as a
consideration timing out tests;
set all test to timeout at 10minutes regardless
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/277ce3d8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/277ce3d8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/277ce3d8
Branch: refs/heads/HBASE-19064
Commit: 277ce3d8a3d68f87e82c98fdeb3a3cb3dee33036
Parents: f5dbdf0
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 23:10:12 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/277ce3d8/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/277ce3d8/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 20186a7..d2cf916 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 -->