honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add integration test phase for elasticsearch core/

This commit is contained in:
Robert Muir 2015-08-03 09:43:11 -04:00
parent c5b91b9058
commit 379ffdb8ee
13 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TESTING.asciidoc
View File

@ -261,7 +261,7 @@ The REST tests are run automatically when executing the maven test command. To r
REST tests use the following command:
---------------------------------------------------------------------------
mvn test -Dtests.filter="@Rest"
mvn verify -Dtests.filter="@Rest"
---------------------------------------------------------------------------
`ElasticsearchRestTests` is the executable test class that runs all the

5
core/pom.xml
View File

@ -16,11 +16,6 @@
<name>Elasticsearch Core</name>
<description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
<properties>
<skip.integ.tests>true</skip.integ.tests>
</properties>
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>

4
core/src/test/java/org/elasticsearch/test/rest/Rest0Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 0 */
public class Rest0Tests extends ElasticsearchRestTestCase {
public Rest0Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest0IT extends ElasticsearchRestTestCase {
public Rest0IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest1Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 1 */
public class Rest1Tests extends ElasticsearchRestTestCase {
public Rest1Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest1IT extends ElasticsearchRestTestCase {
public Rest1IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest2Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 2 */
public class Rest2Tests extends ElasticsearchRestTestCase {
public Rest2Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest2IT extends ElasticsearchRestTestCase {
public Rest2IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest3Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 3 */
public class Rest3Tests extends ElasticsearchRestTestCase {
public Rest3Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest3IT extends ElasticsearchRestTestCase {
public Rest3IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest4Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 4 */
public class Rest4Tests extends ElasticsearchRestTestCase {
public Rest4Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest4IT extends ElasticsearchRestTestCase {
public Rest4IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest5Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 5 */
public class Rest5Tests extends ElasticsearchRestTestCase {
public Rest5Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest5IT extends ElasticsearchRestTestCase {
public Rest5IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest6Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 6 */
public class Rest6Tests extends ElasticsearchRestTestCase {
public Rest6Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest6IT extends ElasticsearchRestTestCase {
public Rest6IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

4
core/src/test/java/org/elasticsearch/test/rest/Rest7Tests.java → core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java
View File

@ -27,8 +27,8 @@ import org.elasticsearch.test.rest.parser.RestTestParseException;
import java.io.IOException;
/** Rest API tests subset 7 */
public class Rest7Tests extends ElasticsearchRestTestCase {
public Rest7Tests(@Name("yaml") RestTestCandidate testCandidate) {
public class Rest7IT extends ElasticsearchRestTestCase {
public Rest7IT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}
@ParametersFactory

17
distribution/pom.xml
View File

@ -132,6 +132,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>junit4-maven-plugin</artifactId>
<executions>
<execution>
<id>integ-tests</id>
<configuration>
<!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
<parallelism>1</parallelism>
<systemProperties>
<!-- use external cluster -->
<tests.cluster>127.0.0.1:9300</tests.cluster>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

17
plugins/pom.xml
View File

@ -400,6 +400,23 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>junit4-maven-plugin</artifactId>
<executions>
<execution>
<id>integ-tests</id>
<configuration>
<!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
<parallelism>1</parallelism>
<systemProperties>
<!-- use external cluster -->
<tests.cluster>127.0.0.1:9300</tests.cluster>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

4
pom.xml
View File

@ -733,16 +733,12 @@
summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
dir="${project.build.directory}/failsafe-reports"/>
</listeners>
<!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
<parallelism>1</parallelism>
<includes>
<include>**/*IT.class</include>
</includes>
<systemProperties>
<!-- integ tests are typically slow! -->
<tests.slow>true</tests.slow>
<!-- use external cluster -->
<tests.cluster>127.0.0.1:9300</tests.cluster>
<!-- let framework know we are running integ tests, for correct 'reproduce with' line -->
<tests.verify.phase>true</tests.verify.phase>
</systemProperties>