accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] git commit: Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level"
Date Thu, 11 Sep 2014 06:00:06 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT c566e931b -> a9ea7a990
  refs/heads/master fa10a3143 -> 32f27693f


Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level"

This reverts commit c566e931b2bad8cb7667b4f8e67992e2a5f9a060.

Timeout rule *is* applied per method in a class, not the sum of all methods in the class.


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: a9ea7a990bd4c2571390edf0688ad4c8793de1b0
Parents: c566e93
Author: Josh Elser <elserj@apache.org>
Authored: Wed Sep 10 22:59:17 2014 -0700
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Sep 10 22:59:17 2014 -0700

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/VolumeIT.java         | 3 +--
 .../java/org/apache/accumulo/test/functional/CreateAndUseIT.java  | 3 +--
 .../java/org/apache/accumulo/test/functional/ReadWriteIT.java     | 3 +--
 .../org/apache/accumulo/test/functional/SslWithClientAuthIT.java  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9ea7a99/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
index 3a8d2ce..3af7eb8 100644
--- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java
@@ -83,8 +83,7 @@ public class VolumeIT extends ConfigurableMacIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    // class level timeout
-    return 7 * 5 * 60;
+    return 5 * 60;
   }
 
   @SuppressWarnings("deprecation")

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9ea7a99/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
index 4df7aae..b9b54c7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java
@@ -43,8 +43,7 @@ public class CreateAndUseIT extends SimpleMacIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    // class level timeout
-    return 3 * 4 * 60;
+    return 4 * 60;
   }
 
   private static SortedSet<Text> splits;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9ea7a99/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index 3af1ed4..60b1908 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -61,8 +61,7 @@ public class ReadWriteIT extends ConfigurableMacIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    // class level timeout
-    return 7 * 6 * 60;
+    return 6 * 60;
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9ea7a99/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
index 0733146..4c49b1b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
@@ -42,8 +42,7 @@ public class SslWithClientAuthIT extends SslIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    // class level timeout
-    return 5 * 6 * 60;
+    return 6 * 60;
   }
 
   @Override


Mime
View raw message