You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/08/22 00:27:11 UTC
[3/9] git commit: ACCUMULO-3074 Increase the timeout for
MergeIT#mergeTest
ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df57998
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df57998
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df57998
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 6df579984697e5022b94b3490c667cd012d6be05
Parents: 0088326
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:42:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:42:03 2014 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/test/functional/MergeIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df57998/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
index 80ea6b2..62cb141 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -99,7 +99,7 @@ public class MergeIT extends SimpleMacIT {
return strings;
}
- @Test(timeout = 4 * 60 * 1000)
+ @Test(timeout = 8 * 60 * 1000)
public void mergeTest() throws Exception {
int tc = 0;
Connector c = getConnector();