accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [26/50] [abbrv] git commit: ACCUMULO-1537 moved integration tests to test/src/test; added more timeouts to tests
Date Wed, 17 Jul 2013 02:33:28 GMT
ACCUMULO-1537 moved integration tests to test/src/test; added more timeouts to tests

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501750 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/868ef44a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/868ef44a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/868ef44a

Branch: refs/heads/ACCUMULO-1496
Commit: 868ef44a281f781313ac959d0eb9ef5ccabb900f
Parents: 7a1075a
Author: Eric C. Newton <ecn@apache.org>
Authored: Wed Jul 10 12:30:26 2013 +0000
Committer: Eric C. Newton <ecn@apache.org>
Committed: Wed Jul 10 12:30:26 2013 +0000

----------------------------------------------------------------------
 .../test/functional/MasterFailoverIT.java       | 59 --------------------
 .../test/functional/SplitRecoveryIT.java        | 30 ----------
 .../test/functional/LateLastContactIT.java      |  2 +-
 .../test/functional/MasterFailoverIT.java       | 59 ++++++++++++++++++++
 .../accumulo/test/functional/NativeMapIT.java   |  2 +-
 .../accumulo/test/functional/RestartIT.java     | 14 ++---
 .../test/functional/SplitRecoveryIT.java        | 30 ++++++++++
 7 files changed, 97 insertions(+), 99 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
deleted file mode 100644
index 9934874..0000000
--- a/test/src/main/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test.functional;
-
-import java.util.Collections;
-
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.minicluster.MiniAccumuloConfig;
-import org.apache.accumulo.minicluster.ProcessReference;
-import org.apache.accumulo.minicluster.ServerType;
-import org.apache.accumulo.server.master.Master;
-import org.apache.accumulo.test.TestIngest;
-import org.apache.accumulo.test.VerifyIngest;
-import org.junit.Test;
-
-public class MasterFailoverIT extends MacTest {
-  
-  @Override
-  public void configure(MiniAccumuloConfig cfg) {
-    cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"));
-  }
-
-  @Test(timeout=30*1000)
-  public void test() throws Exception {
-    Connector c = getConnector();
-    c.tableOperations().create("test_ingest");
-    TestIngest.Opts opts = new TestIngest.Opts();
-    TestIngest.ingest(c, opts, BWOPTS);
-    for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) {
-      cluster.killProcess(ServerType.MASTER, master);
-    }
-    // start up a new one
-    Process p = cluster.exec(Master.class);
-    // talk to it
-    c.tableOperations().rename("test_ingest", "test_ingest2");
-    try {
-      VerifyIngest.Opts vopts = new VerifyIngest.Opts();
-      vopts.tableName = "test_ingest2";
-      VerifyIngest.verifyIngest(c, vopts, SOPTS);
-    } finally {
-      p.destroy();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
deleted file mode 100644
index 6ada2c2..0000000
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test.functional;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class SplitRecoveryIT extends MacTest {
-  
-  @Test(timeout=10*1000)
-  public void test() throws Exception {
-    assertEquals(0, cluster.exec(SplitRecoveryTest.class).waitFor());
-  }
-  
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
index 7edb8df..24db37c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java
@@ -35,7 +35,7 @@ public class LateLastContactIT extends MacTest {
     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());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
new file mode 100644
index 0000000..9934874
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test.functional;
+
+import java.util.Collections;
+
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.minicluster.MiniAccumuloConfig;
+import org.apache.accumulo.minicluster.ProcessReference;
+import org.apache.accumulo.minicluster.ServerType;
+import org.apache.accumulo.server.master.Master;
+import org.apache.accumulo.test.TestIngest;
+import org.apache.accumulo.test.VerifyIngest;
+import org.junit.Test;
+
+public class MasterFailoverIT extends MacTest {
+  
+  @Override
+  public void configure(MiniAccumuloConfig cfg) {
+    cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"));
+  }
+
+  @Test(timeout=30*1000)
+  public void test() throws Exception {
+    Connector c = getConnector();
+    c.tableOperations().create("test_ingest");
+    TestIngest.Opts opts = new TestIngest.Opts();
+    TestIngest.ingest(c, opts, BWOPTS);
+    for (ProcessReference master : cluster.getProcesses().get(ServerType.MASTER)) {
+      cluster.killProcess(ServerType.MASTER, master);
+    }
+    // start up a new one
+    Process p = cluster.exec(Master.class);
+    // talk to it
+    c.tableOperations().rename("test_ingest", "test_ingest2");
+    try {
+      VerifyIngest.Opts vopts = new VerifyIngest.Opts();
+      vopts.tableName = "test_ingest2";
+      VerifyIngest.verifyIngest(c, vopts, SOPTS);
+    } finally {
+      p.destroy();
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java b/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
index b5b6953..ec00fe5 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/NativeMapIT.java
@@ -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());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/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 9c6549e..523773e 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
+  @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());
   }
-  
-  
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/868ef44a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
new file mode 100644
index 0000000..6ada2c2
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test.functional;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class SplitRecoveryIT extends MacTest {
+  
+  @Test(timeout=10*1000)
+  public void test() throws Exception {
+    assertEquals(0, cluster.exec(SplitRecoveryTest.class).waitFor());
+  }
+  
+}


Mime
View raw message