accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/4] accumulo git commit: ACCUMULO-3614 More tests missing timeouts
Date Mon, 23 Feb 2015 18:48:34 GMT
ACCUMULO-3614 More tests missing timeouts


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

Branch: refs/heads/master
Commit: 92384163ad8d2597f91088855325c824bf8aed8e
Parents: 9cf63e1
Author: Josh Elser <elserj@apache.org>
Authored: Mon Feb 23 13:43:35 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Feb 23 13:43:35 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/SplitCancelsMajCIT.java    | 7 ++++++-
 .../accumulo/test/functional/DeletedTablesDontFlushIT.java   | 7 ++++++-
 .../accumulo/test/replication/StatusCombinerMacIT.java       | 8 +++++---
 3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
index 53354b1..64437b7 100644
--- a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java
@@ -39,7 +39,12 @@ import org.junit.Test;
 // ACCUMULO-2862
 public class SplitCancelsMajCIT extends SharedMiniClusterIT {
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Override
+  public int defaultTimeoutSeconds() {
+    return 2 * 60;
+  }
+
+  @Test
   public void test() throws Exception {
     final String tableName = getUniqueNames(1)[0];
     final Connector c = getConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
index 292ad63..ee08017 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
@@ -32,7 +32,12 @@ import org.junit.Test;
 // ACCUMULO-2880
 public class DeletedTablesDontFlushIT extends SharedMiniClusterIT {
 
-  @Test(timeout = 60 * 1000)
+  @Override
+  public int defaultTimeoutSeconds() {
+    return 60;
+  }
+
+  @Test
   public void test() throws Exception {
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];

http://git-wip-us.apache.org/repos/asf/accumulo/blob/92384163/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
index 6363ba5..53dbaf6 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java
@@ -46,11 +46,13 @@ import org.junit.Test;
 
 import com.google.common.collect.Iterables;
 
-/**
- *
- */
 public class StatusCombinerMacIT extends SharedMiniClusterIT {
 
+  @Override
+  public int defaultTimeoutSeconds() {
+    return 60;
+  }
+
   @Test
   public void testCombinerSetOnMetadata() throws Exception {
     TableOperations tops = getConnector().tableOperations();


Mime
View raw message