diff --git a/muted-tests.yml b/muted-tests.yml index d7f732be7e63b..224e3fa6fac34 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -290,7 +290,7 @@ tests: method: testOneRemoteClusterPartial issue: https://github.com/elastic/elasticsearch/issues/124055 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT - method: test {lookup-join.MvJoinKeyOnTheLookupIndex ASYNC} + method: test {csv-spec:lookup-join.MvJoinKeyOnTheLookupIndex} issue: https://github.com/elastic/elasticsearch/issues/128030 - class: org.elasticsearch.packaging.test.EnrollmentProcessTests method: test20DockerAutoFormCluster @@ -314,11 +314,8 @@ tests: method: testEarlyTermination issue: https://github.com/elastic/elasticsearch/issues/128721 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT - method: test {lookup-join.EnrichLookupStatsBug ASYNC} + method: test {csv-spec:lookup-join.EnrichLookupStatsBug} issue: https://github.com/elastic/elasticsearch/issues/129228 -- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT - method: test {lookup-join.EnrichLookupStatsBug SYNC} - issue: https://github.com/elastic/elasticsearch/issues/129229 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT method: test {lookup-join.MultipleBatches* issue: https://github.com/elastic/elasticsearch/issues/129210 @@ -363,7 +360,7 @@ tests: method: testWriteCanRejectOnPrimaryBasedOnMaxOperationSize issue: https://github.com/elastic/elasticsearch/issues/130281 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT - method: test {lookup-join.MvJoinKeyOnFrom SYNC} + method: test {csv-spec:lookup-join.MvJoinKeyOnFrom} issue: https://github.com/elastic/elasticsearch/issues/130296 - class: org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutorTests method: testSuccessfulExecution @@ -378,7 +375,7 @@ tests: method: failed tasks output logged to console when spooling true issue: https://github.com/elastic/elasticsearch/issues/119509 - class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT - method: test {lookup-join.MvJoinKeyFromRow ASYNC} + method: test {csv-spec:lookup-join.MvJoinKeyFromRow} issue: https://github.com/elastic/elasticsearch/issues/130642 - class: org.elasticsearch.indices.stats.IndexStatsIT method: testFilterCacheStats @@ -390,7 +387,7 @@ tests: method: testOpenContextsAfterRejections issue: https://github.com/elastic/elasticsearch/issues/130821 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT - method: test {lookup-join.MvJoinKeyOnFromAfterStats ASYNC} + method: test {csv-spec:lookup-join.MvJoinKeyOnFromAfterStats} issue: https://github.com/elastic/elasticsearch/issues/131148 - class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT method: testLookupJoinAliases @@ -561,11 +558,10 @@ tests: # issue: "https://github.com/elastic/elasticsearch/..." # Note that this mutes for the unit-test-like CsvTests only. # Muting all the integration tests can be done using the class "org.elasticsearch.xpack.esql.**". -# Consider however, that some tests are named as "test {file.test SYNC}" and "ASYNC" in the integration tests. # To mute all 3 tests safely everywhere use: # - class: "org.elasticsearch.xpack.esql.**" # method: "test {union_types.MultiIndexIpStringStatsInline}" # issue: "https://github.com/elastic/elasticsearch/..." # - class: "org.elasticsearch.xpack.esql.**" # method: "test {union_types.MultiIndexIpStringStatsInline *}" -# issue: "https://github.com/elastic/elasticsearch/..." \ No newline at end of file +# issue: "https://github.com/elastic/elasticsearch/..." diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java index 38885d4a3263f..5c6d0186cdf77 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java @@ -80,7 +80,7 @@ public class MultiClusterSpecIT extends EsqlSpecTestCase { private static RestClient remoteClusterClient; private static DataLocation dataLocation = null; - @ParametersFactory(argumentFormatting = "%2$s.%3$s") + @ParametersFactory(argumentFormatting = "csv-spec:%2$s.%3$s") public static List readScriptSpec() throws Exception { List urls = classpathResources("/*.csv-spec"); assertTrue("Not enough specs found " + urls, urls.size() > 0); diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java index e3f632c156e7f..7e0bd6031f455 100644 --- a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java +++ b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java @@ -97,7 +97,7 @@ public abstract class EsqlSpecTestCase extends ESRestTestCase { protected final Mode mode; protected static Boolean supportsTook; - @ParametersFactory(argumentFormatting = "%2$s.%3$s") + @ParametersFactory(argumentFormatting = "csv-spec:%2$s.%3$s") public static List readScriptSpec() throws Exception { List urls = classpathResources("/*.csv-spec"); assertTrue("Not enough specs found " + urls, urls.size() > 0); diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java index b38b3089823d5..d8bb0b71974ac 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java @@ -193,7 +193,7 @@ public class CsvTests extends ESTestCase { private ThreadPool threadPool; private Executor executor; - @ParametersFactory(argumentFormatting = "%2$s.%3$s") + @ParametersFactory(argumentFormatting = "csv-spec:%2$s.%3$s") public static List readScriptSpec() throws Exception { List urls = classpathResources("/*.csv-spec"); assertThat("Not enough specs found " + urls, urls, hasSize(greaterThan(0)));