Migrate remaining ESIntegTestCases to internalClusterTest (#56479)

This commit migrates the ESIntegTestCase tests in x-pack to the
internalClusterTest source set.

Author: rjernst

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionsTasks.java

@@ -47,10 +47,8 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -66,8 +64,6 @@ public class TestingConventionsTasks extends DefaultTask {
 
     private final NamedDomainObjectContainer<TestingConventionRule> naming;
 
-    private List<String> tasks = null;
-
     public TestingConventionsTasks() {
         setDescription("Tests various testing conventions");
         // Run only after everything is compiled
@@ -80,7 +76,6 @@ public Map<String, Set<File>> getClassFilesPerEnabledTask() {
         return getProject().getTasks()
             .withType(Test.class)
             .stream()
-            .filter(t -> tasks == null || tasks.contains(t.getName()))
             .filter(Task::getEnabled)
             .collect(Collectors.toMap(Task::getPath, task -> task.getCandidateClassFiles().getFiles()));
     }
@@ -115,10 +110,6 @@ public void naming(Closure<TestingConventionRule> action) {
         naming.configure(action);
     }
 
-    public void setTasks(String... tasks) {
-        this.tasks = Arrays.asList(tasks);
-    }
-
     @Input
     public Set<String> getMainClassNamedLikeTests() {
         SourceSetContainer javaSourceSets = GradleUtils.getJavaSourceSets(getProject());
@@ -168,8 +159,10 @@ public void doCheck() throws IOException {
 
             final Map<String, Set<File>> classFilesPerTask = getClassFilesPerEnabledTask();
 
+            final Set<File> testSourceSetFiles = Util.getJavaTestSourceSet(getProject()).get().getRuntimeClasspath().getFiles();
             final Map<String, Set<Class<?>>> testClassesPerTask = classFilesPerTask.entrySet()
                 .stream()
+                .filter(entry -> testSourceSetFiles.containsAll(entry.getValue()))
                 .collect(
                     Collectors.toMap(
                         Map.Entry::getKey,

server/build.gradle

@@ -180,7 +180,6 @@ testingConventions {
       baseClass "org.elasticsearch.test.ESSingleNodeTestCase"
     }
   }
-  tasks = ['test']
 }
 
 task generateModulesList {

x-pack/plugin/async-search/build.gradle

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
     name 'x-pack-async-search'
     description 'A module which allows to track the progress of a search asynchronously.'
@@ -35,13 +36,3 @@ dependencyLicenses {
 
 integTest.enabled = false
 
-// Instead we create a separate task to run the
-// tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = 'Java fantasy integration tests'
-  mustRunAfter test
-
-  include '**/*IT.class'
-}
-
-check.dependsOn internalClusterTest

x-pack/plugin/async-search/src/test/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java renamed to x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java

@@ -3,6 +3,7 @@ import org.elasticsearch.gradle.info.BuildParams
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   name 'x-pack-autoscaling'
@@ -16,19 +17,12 @@ archivesBaseName = 'x-pack-autoscaling'
 
 integTest.enabled = false
 
-task internalClusterTest(type: Test) {
-  description = 'Java fantasy integration tests'
-  mustRunAfter test
-
-  include '**/*IT.class'
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
+tasks.named('internalClusterTest').configure {
   if (BuildParams.isSnapshotBuild() == false) {
     systemProperty 'es.autoscaling_feature_flag_registered', 'true'
   }
 }
 
-check.dependsOn internalClusterTest
-
 dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')
   testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')

x-pack/plugin/autoscaling/build.gradle

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
   name 'x-pack-ccr'
   description 'Elasticsearch Expanded Pack Plugin - CCR'
@@ -16,28 +17,18 @@ integTest.enabled = false
 // Integration Test classes that cannot run with the security manager
 String[] noSecurityManagerITClasses = ["**/CloseFollowerIndexIT.class"]
 
-task internalClusterTestNoSecurityManager(type: Test) {
-  description = 'Java fantasy integration tests with no security manager'
-
+tasks.register('internalClusterTestNoSecurityManager', Test) {
+  testClassesDirs = sourceSets.internalClusterTest.output.classesDirs
+  classpath = sourceSets.internalClusterTest.runtimeClasspath
   include noSecurityManagerITClasses
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
   systemProperty 'tests.security.manager', 'false'
 }
+check.dependsOn 'internalClusterTestNoSecurityManager'
 
-// Instead we create a separate task to run the
-// tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = 'Java fantasy integration tests'
-  dependsOn internalClusterTestNoSecurityManager
-  mustRunAfter test
-
-  include '**/*IT.class'
+tasks.named('internalClusterTest').configure {
   exclude noSecurityManagerITClasses
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
 }
 
-check.dependsOn internalClusterTest
-
 // add all sub-projects of the qa sub-project
 gradle.projectsEvaluated {
   project.subprojects

x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java renamed to x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java

@@ -12,13 +12,13 @@
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.MapperTestUtils;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.ccr.Ccr;
 import org.elasticsearch.xpack.ccr.CcrSettings;
-import org.elasticsearch.xpack.ccr.IndexFollowingIT;
 import org.elasticsearch.xpack.core.ccr.action.ResumeFollowAction;
 
 import java.io.IOException;
@@ -34,12 +34,20 @@
 
 public class TransportResumeFollowActionTests extends ESTestCase {
 
+    public static ResumeFollowAction.Request resumeFollow(String followerIndex) {
+        ResumeFollowAction.Request request = new ResumeFollowAction.Request();
+        request.setFollowerIndex(followerIndex);
+        request.getParameters().setMaxRetryDelay(TimeValue.timeValueMillis(10));
+        request.getParameters().setReadPollTimeout(TimeValue.timeValueMillis(10));
+        return request;
+    }
+
     public void testValidation() throws IOException {
         final Map<String, String> customMetadata = new HashMap<>();
         customMetadata.put(Ccr.CCR_CUSTOM_METADATA_LEADER_INDEX_SHARD_HISTORY_UUIDS, "uuid");
         customMetadata.put(Ccr.CCR_CUSTOM_METADATA_LEADER_INDEX_UUID_KEY, "_na_");
 
-        ResumeFollowAction.Request request = IndexFollowingIT.resumeFollow("index2");
+        ResumeFollowAction.Request request = resumeFollow("index2");
         String[] UUIDs = new String[]{"uuid"};
         {
             IndexMetadata leaderIMD = createIMD("index1", 5, Settings.EMPTY, null);

x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyActionIT.java renamed to x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingPolicyActionIT.java

@@ -6,6 +6,7 @@ import java.nio.file.Paths
 
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'nebula.maven-base-publish'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 archivesBaseName = 'x-pack-core'
 
@@ -148,8 +149,3 @@ thirdPartyAudit.ignoreMissingClasses(
 // so we disable integ tests
 integTest.enabled = false
 
-// There are some integ tests that don't require a cluster, we still want to run those
-task internalClusterTest(type: Test) {
-  include "**/*IT.class"
-}
-check.dependsOn internalClusterTest

x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java renamed to x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
   name 'x-pack-enrich'
   description 'Elasticsearch Expanded Pack Plugin - Enrich'
@@ -21,17 +22,6 @@ dependencies {
 // No real integ tests in the module:
 integTest.enabled = false
 
-// Instead we create a separate task to run the tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = '🌈🌈🌈🦄 Welcome to fantasy integration tests land! 🦄🌈🌈🌈'
-  mustRunAfter test
-
-  include '**/*IT.class'
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
-}
-
-check.dependsOn internalClusterTest
-
 // add all sub-projects of the qa sub-project
 gradle.projectsEvaluated {
   project.subprojects

x-pack/plugin/ccr/build.gradle

@@ -38,9 +38,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static org.elasticsearch.xpack.enrich.EnrichMultiNodeIT.DECORATE_FIELDS;
-import static org.elasticsearch.xpack.enrich.EnrichMultiNodeIT.MATCH_FIELD;
-import static org.elasticsearch.xpack.enrich.EnrichMultiNodeIT.SOURCE_INDEX_NAME;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
@@ -50,6 +47,10 @@
 
 public class BasicEnrichTests extends ESSingleNodeTestCase {
 
+    static final String SOURCE_INDEX_NAME = "users";
+    static final String MATCH_FIELD = "email";
+    static final String[] DECORATE_FIELDS = new String[] { "address", "city", "country" };
+
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
         return Arrays.asList(LocalStateEnrich.class, ReindexPlugin.class, IngestCommonPlugin.class, MustachePlugin.class, GeoPlugin.class);

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java renamed to x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java

@@ -3,6 +3,7 @@ import org.elasticsearch.gradle.info.BuildParams
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
   name 'x-pack-eql'
   description 'The Elasticsearch plugin that powers EQL for Elasticsearch'
@@ -20,21 +21,12 @@ archivesBaseName = 'x-pack-eql'
 // All integration tests live in qa modules
 integTest.enabled = false
 
-task internalClusterTest(type: Test) {
-  mustRunAfter test
-  include '**/*IT.class'
-  /*
-   * We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
-   * other if we allow them to set the number of available processors as it's set-once in Netty.
-   */
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
+tasks.named('internalClusterTest').configure {
   if (BuildParams.isSnapshotBuild() == false) {
     systemProperty 'es.eql_feature_flag_registered', 'true'
   }
 }
 
-check.dependsOn internalClusterTest
-
 dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')
   compileOnly(project(':modules:lang-painless')) {

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java renamed to x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
   name 'x-pack-ml'
   description 'Elasticsearch Expanded Pack Plugin - Machine Learning'
@@ -99,17 +100,6 @@ project.afterEvaluate {
 // so we disable integ tests
 integTest.enabled = false
 
-// Instead we create a separate task to run the
-// tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = 'Multi-node tests'
-
-  include '**/*IT.class'
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
-}
-check.dependsOn internalClusterTest
-internalClusterTest.mustRunAfter test
-
 // add all sub-projects of the qa sub-project
 gradle.projectsEvaluated {
   project.subprojects
@@ -118,8 +108,3 @@ gradle.projectsEvaluated {
     .findAll { it.path.startsWith(project.path + ":qa") }
     .each { check.dependsOn it.check }
 }
-
-// also add an "alias" task to make typing on the command line easier
-task icTest {
-  dependsOn internalClusterTest
-}

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrDisabledIT.java renamed to x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrDisabledIT.java

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 esplugin {
   name 'x-pack-monitoring'
   description 'Elasticsearch Expanded Pack Plugin - Monitoring'
@@ -45,20 +46,3 @@ dependencyLicenses {
 // installing them as individual plugins for integ tests doesn't make sense,
 // so we disable integ tests
 integTest.enabled = false
-
-// Instead we create a separate task to run the
-// tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = 'Multi-node tests'
-  mustRunAfter test
-
-  include '**/*IT.class'
-  systemProperty 'es.set.netty.runtime.available.processors', 'false'
-}
-
-check.dependsOn internalClusterTest
-
-// also add an "alias" task to make typing on the command line easier task icTest {
-task icTest {
-  dependsOn internalClusterTest
-}

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java renamed to x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrLicenseIT.java

@@ -1,6 +1,7 @@
 evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.internal-cluster-test'
 
 esplugin {
   name 'search-business-rules'
@@ -13,17 +14,6 @@ archivesBaseName = 'x-pack-searchbusinessrules'
 
 integTest.enabled = false
 
-// Instead we create a separate task to run the
-// tests based on ESIntegTestCase
-task internalClusterTest(type: Test) {
-  description = 'Java fantasy integration tests'
-  mustRunAfter test
-
-  include '**/*IT.class'
-}
-
-check.dependsOn internalClusterTest
-
 dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')
   testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
@@ -35,8 +25,3 @@ dependencyLicenses {
   ignoreSha 'x-pack-core'
 }
 
-//testingConventions.naming {
-//    IT {
-//        baseClass "org.elasticsearch.xpack.searchbusinessrules.PinnedQueryBuilderIT"
-//    }
-//}