diff --git a/muted-tests.yml b/muted-tests.yml index 1d97ceed40e99..575b71c948d09 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -447,9 +447,6 @@ tests: - class: org.elasticsearch.xpack.esql.plugin.CanMatchIT method: testAliasFilters issue: https://github.com/elastic/elasticsearch/issues/134512 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.FiveFork} - issue: https://github.com/elastic/elasticsearch/issues/134560 - class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT method: test {csv-spec:spatial.ConvertCartesianFromStringParseError} issue: https://github.com/elastic/elasticsearch/issues/134635 @@ -471,9 +468,6 @@ tests: - class: org.elasticsearch.xpack.esql.expression.function.scalar.score.DecayTests method: "testEvaluateBlockWithNulls {TestCase=, , , <_source> #2}" issue: https://github.com/elastic/elasticsearch/issues/134679 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBeforeStatsByWithWhere} - issue: https://github.com/elastic/elasticsearch/issues/134817 - class: org.elasticsearch.repositories.blobstore.testkit.analyze.MinioRepositoryAnalysisRestIT method: testRepositoryAnalysis issue: https://github.com/elastic/elasticsearch/issues/134853 @@ -492,15 +486,9 @@ tests: - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT method: test {csv-spec:stats.CountDistinctWithConditions} issue: https://github.com/elastic/elasticsearch/issues/134993 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBeforeStatsWithWhere} - issue: https://github.com/elastic/elasticsearch/issues/135041 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT method: test issue: https://github.com/elastic/elasticsearch/issues/135055 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkWithStats} - issue: https://github.com/elastic/elasticsearch/issues/135116 - class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT method: testLookupExplosionBigString issue: https://github.com/elastic/elasticsearch/issues/135122 @@ -549,9 +537,6 @@ tests: - class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT method: testMatchAllQuery issue: https://github.com/elastic/elasticsearch/issues/135820 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkAfterEnrich} - issue: https://github.com/elastic/elasticsearch/issues/135830 - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testOneRemoteClusterPartial issue: https://github.com/elastic/elasticsearch/issues/124055 @@ -564,15 +549,9 @@ tests: - class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT method: testHistogramAggregation issue: https://github.com/elastic/elasticsearch/issues/136002 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkWithFiltersOnConstantValues} - issue: https://github.com/elastic/elasticsearch/issues/136031 - class: org.elasticsearch.xpack.security.authz.microsoft.MicrosoftGraphAuthzPluginIT method: testConcurrentAuthentication issue: https://github.com/elastic/elasticsearch/issues/135777 -- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT - method: test {csv-spec:fork.ForkBranchWithInlineStats} - issue: https://github.com/elastic/elasticsearch/issues/136091 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT method: test {csv-spec:date.EvalDateTruncQuarterlyIntervalWithGTInRange} issue: https://github.com/elastic/elasticsearch/issues/136102 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 2df8d40e0a095..c917929dd83ce 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 @@ -48,7 +48,6 @@ import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.CSV_DATASET_MAP; import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES; import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources; -import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_FORK_FOR_REMOTE_INDICES; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9; import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINE_STATS; @@ -166,12 +165,7 @@ protected void shouldSkipTest(String testName) throws IOException { // Tests that do SORT before LOOKUP JOIN - not supported in CCS assumeFalse("LOOKUP JOIN after SORT not yet supported in CCS", testName.contains("OnTheCoordinator")); - if (testCase.requiredCapabilities.contains(FORK_V9.capabilityName())) { - assumeTrue( - "FORK not yet supported with CCS", - hasCapabilities(adminClient(), List.of(ENABLE_FORK_FOR_REMOTE_INDICES.capabilityName())) - ); - } + assumeFalse("FORK not yet supported with CCS", testCase.requiredCapabilities.contains(FORK_V9.capabilityName())); } private TestFeatureService remoteFeaturesService() throws IOException {