accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [35/50] [abbrv] git commit: ACCUMULO-1537 increase timeouts, fix TableIT
Date Wed, 17 Jul 2013 02:33:37 GMT
ACCUMULO-1537 increase timeouts, fix TableIT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502336 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/ACCUMULO-1496
Commit: f43930d00298c3dde6a4abd75702b2d7007c2ce3
Parents: 65b5a3a
Author: Eric C. Newton <ecn@apache.org>
Authored: Thu Jul 11 19:33:08 2013 +0000
Committer: Eric C. Newton <ecn@apache.org>
Committed: Thu Jul 11 19:33:08 2013 +0000

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/MergeMetaIT.java  |  2 +-
 .../org/apache/accumulo/test/functional/ReadWriteIT.java  |  2 +-
 .../org/apache/accumulo/test/functional/RestartIT.java    | 10 +++++-----
 .../java/org/apache/accumulo/test/functional/TableIT.java |  1 +
 4 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43930d0/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
index 2041232..f9c8b3c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 
 public class MergeMetaIT extends MacTest {
   
-  @Test(timeout = 30 * 1000)
+  @Test(timeout = 60 * 1000)
   public void mergeMeta() throws Exception {
     Connector c = getConnector();
     SortedSet<Text> splits = new TreeSet<Text>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43930d0/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 7c74326..e6d08a6 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
@@ -232,7 +232,7 @@ public class ReadWriteIT extends MacTest {
     assertTrue(foundFile);
   }
   
-  @Test(timeout = 90 * 1000)
+  @Test(timeout = 2* 60 * 1000)
   public void localityGroupChange() throws Exception {
     // Make changes to locality groups and ensure nothing is lostssh
     final Connector connector = getConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43930d0/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
index 523773e..2053916 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -48,7 +48,7 @@ public class RestartIT extends MacTest {
   private static final VerifyIngest.Opts VOPTS = new VerifyIngest.Opts();
   private static final BatchWriterOpts BWOPTS = new BatchWriterOpts();
   
-  @Test(timeout=30*1000)
+  @Test(timeout=60*1000)
   public void restartMaster() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -64,7 +64,7 @@ public class RestartIT extends MacTest {
     ingest.destroy();
   }
   
-  @Test(timeout=30*1000)
+  @Test(timeout=60*1000)
   public void restartMasterRecovery() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -101,7 +101,7 @@ public class RestartIT extends MacTest {
     ingest.destroy();
   }
   
-  @Test(timeout=30*1000)
+  @Test(timeout= 60 * 1000)
   public void killedTabletServer() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -116,7 +116,7 @@ public class RestartIT extends MacTest {
     }
   }
 
-  @Test(timeout=60*1000)
+  @Test(timeout=2 * 60 * 1000)
   public void killedTabletServerDuringShutdown() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -127,7 +127,7 @@ public class RestartIT extends MacTest {
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
   
-  @Test(timeout=30*1000)
+  @Test(timeout= 60 * 1000)
   public void shutdownDuringCompactingSplitting() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43930d0/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
index e1243aa..8f2244b 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
@@ -50,6 +50,7 @@ public class TableIT extends MacTest {
     to.create("test_ingest");
     TestIngest.Opts opts = new TestIngest.Opts();
     TestIngest.ingest(c, opts, new BatchWriterOpts());
+    to.flush("test_ingest", null, null, true);
     VerifyIngest.Opts vopts = new VerifyIngest.Opts();
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     String id = to.tableIdMap().get("test_ingest");


Mime
View raw message