svn commit: r1502336 - in /accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional: MergeMetaIT.java ReadWriteIT.java RestartIT.java TableIT.java

[ec...@apache.org]

Author: ecn
Date: Thu Jul 11 19:33:08 2013
New Revision: 1502336

URL: http://svn.apache.org/r1502336
Log:
ACCUMULO-1537 increase timeouts, fix TableIT

Modified:
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java?rev=1502336&r1=1502335&r2=1502336&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MergeMetaIT.java Thu Jul 11 19:33:08 2013
@@ -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>();

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java?rev=1502336&r1=1502335&r2=1502336&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java Thu Jul 11 19:33:08 2013
@@ -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();

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java?rev=1502336&r1=1502335&r2=1502336&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java Thu Jul 11 19:33:08 2013
@@ -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");

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java?rev=1502336&r1=1502335&r2=1502336&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java Thu Jul 11 19:33:08 2013
@@ -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");