single module

Author: dnhatn

test/external-modules/error-query/build.gradle

@@ -8,11 +8,20 @@
  */
 
 apply plugin: 'elasticsearch.legacy-yaml-rest-test'
+apply plugin: 'elasticsearch.internal-java-rest-test'
+
+tasks.named('javaRestTest') {
+  usesDefaultDistribution()
+  it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
+}
 
 tasks.named('yamlRestTest').configure {
   it.onlyIf("snapshot build") { buildParams.isSnapshotBuild() }
 }
 
+dependencies {
+  api project(':test:framework')
+}
 esplugin {
   description = 'A test module that exposes a way to simulate search shard failures and warnings'
   classname ='org.elasticsearch.test.errorquery.ErrorQueryPlugin'

test/external-modules/failing-field/src/javaRestTest/java/org/elasticsearch/test/failingfield/EsqlPartialResultsIT.java renamed to test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.test.failingfield;
+package org.elasticsearch.test.esql;
 
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.Request;
@@ -26,13 +26,13 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
 public class EsqlPartialResultsIT extends ESRestTestCase {
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
-        .module("test-failing-field")
+        .module("test-error-query")
         .setting("xpack.security.enabled", "false")
         .setting("xpack.license.self_generated.type", "trial")
         .setting("esql.query.allow_partial_results", "true")
@@ -117,7 +117,7 @@ public void testPartialResult() throws Exception {
             List<?> columns = (List<?>) results.get("columns");
             assertThat(columns, equalTo(List.of(Map.of("name", "fail_me", "type", "long"), Map.of("name", "v", "type", "long"))));
             List<?> values = (List<?>) results.get("values");
-            assertThat(values, hasSize(okIds.size()));
+            assertThat(values.size(), lessThanOrEqualTo(okIds.size()));
         }
         // allow_partial_results = false
         {

test/external-modules/error-query/src/main/java/org/elasticsearch/test/errorquery/ErrorQueryPlugin.java

@@ -9,8 +9,8 @@
 
 package org.elasticsearch.test.errorquery;
 
-import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;
+import org.elasticsearch.test.FailingFieldPlugin;
 
 import java.util.List;
 
@@ -19,7 +19,7 @@
 /**
  * Test plugin that exposes a way to simulate search shard failures and warnings.
  */
-public class ErrorQueryPlugin extends Plugin implements SearchPlugin {
+public class ErrorQueryPlugin extends FailingFieldPlugin implements SearchPlugin {
     public ErrorQueryPlugin() {}
 
     @Override