accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject accumulo git commit: ACCUMULO-3968 Bump junit to 4.12, powermock to 1.6.2, and enable threaddump on test timeout.
Date Wed, 26 Aug 2015 04:36:12 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 2522d6436 -> 9368641c1


ACCUMULO-3968 Bump junit to 4.12, powermock to 1.6.2, and enable threaddump on test timeout.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9368641c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9368641c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9368641c

Branch: refs/heads/master
Commit: 9368641c1c0cdb3ea85678a2a36e1cd7f45ea836
Parents: 2522d64
Author: Josh Elser <elserj@apache.org>
Authored: Wed Aug 26 00:35:23 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Aug 26 00:35:23 2015 -0400

----------------------------------------------------------------------
 pom.xml                                                          | 4 ++--
 .../main/java/org/apache/accumulo/harness/AccumuloITBase.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9368641c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa28fcf..3b01e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
     <maven.min-version>3.0.4</maven.min-version>
     <!-- surefire/failsafe plugin option -->
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <powermock.version>1.5</powermock.version>
+    <powermock.version>1.6.2</powermock.version>
     <!-- surefire/failsafe plugin option -->
     <reuseForks>false</reuseForks>
     <!-- overwritten in hadoop profiles -->
@@ -237,7 +237,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
+        <version>4.12</version>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9368641c/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
index 8e2f6e0..d516c44 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.harness;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
@@ -92,7 +93,8 @@ public class AccumuloITBase {
     } catch (NumberFormatException exception) {
       log.warn("Could not parse timeout.factor, defaulting to no timeout.");
     }
-    return new Timeout(waitLonger * defaultTimeoutSeconds() * 1000);
+
+    return Timeout.builder().withTimeout(waitLonger * defaultTimeoutSeconds(), TimeUnit.SECONDS).withLookingForStuckThread(true).build();
   }
 
   /**


Mime
View raw message