Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 4d2a73def -> c566e931b refs/heads/master de3dcc2da -> fa10a3143
ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c566e931 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c566e931 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c566e931 Branch: refs/heads/1.6.1-SNAPSHOT Commit: c566e931b2bad8cb7667b4f8e67992e2a5f9a060 Parents: 4d2a73d Author: Josh Elser <els...@apache.org> Authored: Wed Sep 10 22:28:49 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 10 22:28:49 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, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c566e931/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 3af7eb8..3a8d2ce 100644 --- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java @@ -83,7 +83,8 @@ public class VolumeIT extends ConfigurableMacIT { @Override protected int defaultTimeoutSeconds() { - return 5 * 60; + // class level timeout + return 7 * 5 * 60; } @SuppressWarnings("deprecation") http://git-wip-us.apache.org/repos/asf/accumulo/blob/c566e931/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 b9b54c7..4df7aae 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,7 +43,8 @@ public class CreateAndUseIT extends SimpleMacIT { @Override protected int defaultTimeoutSeconds() { - return 4 * 60; + // class level timeout + return 3 * 4 * 60; } private static SortedSet<Text> splits; http://git-wip-us.apache.org/repos/asf/accumulo/blob/c566e931/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 60b1908..3af1ed4 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,7 +61,8 @@ public class ReadWriteIT extends ConfigurableMacIT { @Override protected int defaultTimeoutSeconds() { - return 6 * 60; + // class level timeout + return 7 * 6 * 60; } @Test http://git-wip-us.apache.org/repos/asf/accumulo/blob/c566e931/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 4c49b1b..0733146 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,7 +42,8 @@ public class SslWithClientAuthIT extends SslIT { @Override protected int defaultTimeoutSeconds() { - return 6 * 60; + // class level timeout + return 5 * 6 * 60; } @Override
