accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1501750 - in /accumulo/trunk/test/src: main/java/org/apache/accumulo/test/functional/ test/java/org/apache/accumulo/test/functional/
Date Wed, 10 Jul 2013 12:30:26 GMT
Author: ecn
Date: Wed Jul 10 12:30:26 2013
New Revision: 1501750

URL: http://svn.apache.org/r1501750
Log:
ACCUMULO-1537 moved integration tests to test/src/test; added more timeouts to tests

Added:
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
      - copied unchanged from r1501498, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
      - copied unchanged from r1501498, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
Removed:
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
Modified:
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java?rev=1501750&r1=1501749&r2=1501750&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
Wed Jul 10 12:30:26 2013
@@ -35,7 +35,7 @@ public class LateLastContactIT extends M
     cfg.setSiteConfig(Collections.singletonMap(Property.GENERAL_RPC_TIMEOUT.getKey(), "2s"));
   }
 
-  @Test
+  @Test(timeout=60*1000)
   public void test() throws Exception {
     Process zombie = cluster.exec(ZombieTServer.class);
     assertEquals(0, zombie.waitFor());

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java?rev=1501750&r1=1501749&r2=1501750&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
Wed Jul 10 12:30:26 2013
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 public class NativeMapIT extends MacTest {
   
-  @Test
+  @Test(timeout=15*1000)
   public void test() throws Exception {
     assertEquals(0, cluster.exec(NativeMapTest.class).waitFor());
   }

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=1501750&r1=1501749&r2=1501750&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 Wed
Jul 10 12:30:26 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
+  @Test(timeout=30*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
+  @Test(timeout=30*1000)
   public void restartMasterRecovery() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -84,7 +84,7 @@ public class RestartIT extends MacTest {
     VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
   }
   
-  @Test
+  @Test(timeout=30*1000)
   public void restartMasterSplit() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -101,7 +101,7 @@ public class RestartIT extends MacTest {
     ingest.destroy();
   }
   
-  @Test
+  @Test(timeout=30*1000)
   public void killedTabletServer() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -116,7 +116,7 @@ public class RestartIT extends MacTest {
     }
   }
 
-  @Test
+  @Test(timeout=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
+  @Test(timeout=30*1000)
   public void shutdownDuringCompactingSplitting() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");
@@ -139,6 +139,4 @@ public class RestartIT extends MacTest {
     VerifyIngest.verifyIngest(c, VOPTS, SOPTS);
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
-  
-  
 }



Mime
View raw message