Run all tests in parallel by default

Annotate all tests that use @BeforeMethod with singleThreaded=true
gerashegalov · Mar 6, 2014 · f32339d · f32339d
1 parent eb78261
commit f32339d
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -484,6 +484,9 @@
  <artifactId>maven-surefire-plugin</artifactId>
  <configuration combine.children="append">
  <argLine>-Xmx2g -Xms2g -XX:MaxPermSize=512m</argLine>
+ <parallel>methods</parallel>
+ <threadCount>2</threadCount>
+ <perCoreThreadCount>true</perCoreThreadCount>
  </configuration>
  </plugin>
 

diff --git a/...andra/src/test/java/com/facebook/presto/cassandra/TestCachingCassandraSchemaProvider.java b/...andra/src/test/java/com/facebook/presto/cassandra/TestCachingCassandraSchemaProvider.java
@@ -33,6 +33,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+@Test(singleThreaded = true)
 public class TestCachingCassandraSchemaProvider
 {
  private static final String CONNECTOR_ID = "test-cassandra";

diff --git a/presto-example-http/src/test/java/com/facebook/presto/example/TestExampleMetadata.java b/presto-example-http/src/test/java/com/facebook/presto/example/TestExampleMetadata.java
@@ -42,6 +42,7 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@Test(singleThreaded = true)
 public class TestExampleMetadata
 {
  private static final JsonCodec<Map<String, List<ExampleTable>>> CATALOG_CODEC = mapJsonCodec(String.class, listJsonCodec(ExampleTable.class));

diff --git a/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestHiveClient.java b/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestHiveClient.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClient
  extends AbstractTestHiveClient
 {

diff --git a/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java b/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClientS3
  extends AbstractTestHiveClientS3
 {

diff --git a/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java b/presto-hive-cdh4/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestSplitIteratorBackpressure
  extends AbstractTestSplitIteratorBackpressure
 {

diff --git a/presto-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestHiveClient.java b/presto-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestHiveClient.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClient
  extends AbstractTestHiveClient
 {

diff --git a/presto-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java b/presto-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClientS3
  extends AbstractTestHiveClientS3
 {

diff --git a/...to-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java b/...to-hive-hadoop1/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestSplitIteratorBackpressure
  extends AbstractTestSplitIteratorBackpressure
 {

diff --git a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestHiveClient.java b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestHiveClient.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClient
  extends AbstractTestHiveClient
 {

diff --git a/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java b/presto-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestHiveClientS3.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestHiveClientS3
  extends AbstractTestHiveClientS3
 {

diff --git a/...to-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java b/...to-hive-hadoop2/src/test/java/com/facebook/presto/hive/TestSplitIteratorBackpressure.java
@@ -15,7 +15,9 @@
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class TestSplitIteratorBackpressure
  extends AbstractTestSplitIteratorBackpressure
 {

diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestCachingHiveMetastore.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestCachingHiveMetastore.java
@@ -33,6 +33,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
+@Test(singleThreaded = true)
 public class TestCachingHiveMetastore
 {
  private MockHiveMetastoreClient mockClient;

diff --git a/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java b/presto-jdbc/src/test/java/com/facebook/presto/jdbc/TestJdbcResultSet.java
@@ -34,6 +34,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+@Test(singleThreaded = true)
 public class TestJdbcResultSet
 {
  private TestingPrestoServer server;

diff --git a/presto-main/pom.xml b/presto-main/pom.xml
@@ -304,9 +304,6 @@
  <artifactId>maven-surefire-plugin</artifactId>
  <configuration>
  <excludedGroups>hive</excludedGroups>
- <parallel>methods</parallel>
- <threadCount>2</threadCount>
- <perCoreThreadCount>true</perCoreThreadCount>
  </configuration>
  </plugin>
  </plugins>

diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java b/presto-server/src/test/java/com/facebook/presto/server/TestExecuteResource.java
@@ -33,6 +33,7 @@
 import static io.airlift.http.client.StringResponseHandler.createStringResponseHandler;
 import static org.testng.Assert.assertEquals;
 
+@Test(singleThreaded = true)
 public class TestExecuteResource
 {
  private TestingPrestoServer server;

diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestNodeResource.java b/presto-server/src/test/java/com/facebook/presto/server/TestNodeResource.java
@@ -29,6 +29,7 @@
 import static io.airlift.testing.Closeables.closeQuietly;
 import static org.testng.Assert.assertTrue;
 
+@Test(singleThreaded = true)
 public class TestNodeResource
 {
  private TestingPrestoServer server;

diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestQueryResourceServer.java b/presto-server/src/test/java/com/facebook/presto/server/TestQueryResourceServer.java
@@ -67,6 +67,7 @@
 import static io.airlift.json.JsonCodec.jsonCodec;
 import static org.testng.Assert.assertEquals;
 
+@Test(singleThreaded = true)
 public class TestQueryResourceServer
 {
  private HttpClient client;

diff --git a/presto-server/src/test/java/com/facebook/presto/server/TestServer.java b/presto-server/src/test/java/com/facebook/presto/server/TestServer.java
@@ -27,6 +27,7 @@
 import static javax.ws.rs.core.Response.Status.OK;
 import static org.testng.Assert.assertEquals;
 
+@Test(singleThreaded = true)
 public class TestServer
 {
  private TestingPrestoServer server;