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/09/10 23:52:04 UTC

[2/3] git commit: ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.

ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.


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

Branch: refs/heads/master
Commit: 5c8ac744e5e9f3024b5b99cec2b6efe92dc5ac1d
Parents: 5be05eb
Author: Josh Elser <el...@apache.org>
Authored: Wed Sep 10 14:50:27 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Wed Sep 10 14:50:27 2014 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/CreateAndUseIT.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c8ac744/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 c1225b3..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,7 +43,7 @@ public class CreateAndUseIT extends SimpleMacIT {
 
   @Override
   protected int defaultTimeoutSeconds() {
-    return 2 * 60;
+    return 4 * 60;
   }
 
   private static SortedSet<Text> splits;
@@ -57,7 +57,7 @@ public class CreateAndUseIT extends SimpleMacIT {
     }
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test
   public void verifyDataIsPresent() throws Exception {
     Text cf = new Text("cf1");
     Text cq = new Text("cq1");
@@ -89,7 +89,7 @@ public class CreateAndUseIT extends SimpleMacIT {
     Assert.assertEquals("Did not see expected number of rows", 257, ei);
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test
   public void createTableAndScan() throws Exception {
     String table2 = getUniqueNames(1)[0];
     getConnector().tableOperations().create(table2);
@@ -106,7 +106,7 @@ public class CreateAndUseIT extends SimpleMacIT {
     }
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test
   public void createTableAndBatchScan() throws Exception {
     ArrayList<Range> ranges = new ArrayList<Range>();
     for (int i = 1; i < 257; i++) {