Skip to content

Commit 59e02ae

Browse files
authored
ES|QL: Handle CCS tests for FORK (elastic#136468)
1 parent 4871fef commit 59e02ae

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

muted-tests.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,6 @@ tests:
441441
- class: org.elasticsearch.xpack.esql.plugin.CanMatchIT
442442
method: testAliasFilters
443443
issue: https://github.com/elastic/elasticsearch/issues/134512
444-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
445-
method: test {csv-spec:fork.FiveFork}
446-
issue: https://github.com/elastic/elasticsearch/issues/134560
447444
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
448445
method: test {csv-spec:spatial.ConvertCartesianFromStringParseError}
449446
issue: https://github.com/elastic/elasticsearch/issues/134635
@@ -462,9 +459,6 @@ tests:
462459
- class: org.elasticsearch.aggregations.bucket.AggregationReductionCircuitBreakingIT
463460
method: testCBTrippingOnReduction
464461
issue: https://github.com/elastic/elasticsearch/issues/134667
465-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
466-
method: test {csv-spec:fork.ForkBeforeStatsByWithWhere}
467-
issue: https://github.com/elastic/elasticsearch/issues/134817
468462
- class: org.elasticsearch.repositories.blobstore.testkit.analyze.MinioRepositoryAnalysisRestIT
469463
method: testRepositoryAnalysis
470464
issue: https://github.com/elastic/elasticsearch/issues/134853
@@ -483,15 +477,9 @@ tests:
483477
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
484478
method: test {csv-spec:stats.CountDistinctWithConditions}
485479
issue: https://github.com/elastic/elasticsearch/issues/134993
486-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
487-
method: test {csv-spec:fork.ForkBeforeStatsWithWhere}
488-
issue: https://github.com/elastic/elasticsearch/issues/135041
489480
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT
490481
method: test
491482
issue: https://github.com/elastic/elasticsearch/issues/135055
492-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
493-
method: test {csv-spec:fork.ForkWithStats}
494-
issue: https://github.com/elastic/elasticsearch/issues/135116
495483
- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
496484
method: testLookupExplosionBigString
497485
issue: https://github.com/elastic/elasticsearch/issues/135122
@@ -534,9 +522,6 @@ tests:
534522
- class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
535523
method: testMatchAllQuery
536524
issue: https://github.com/elastic/elasticsearch/issues/135820
537-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
538-
method: test {csv-spec:fork.ForkAfterEnrich}
539-
issue: https://github.com/elastic/elasticsearch/issues/135830
540525
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
541526
method: testOneRemoteClusterPartial
542527
issue: https://github.com/elastic/elasticsearch/issues/124055
@@ -549,15 +534,9 @@ tests:
549534
- class: org.elasticsearch.xpack.logsdb.qa.BulkDynamicMappingChallengeRestIT
550535
method: testHistogramAggregation
551536
issue: https://github.com/elastic/elasticsearch/issues/136002
552-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
553-
method: test {csv-spec:fork.ForkWithFiltersOnConstantValues}
554-
issue: https://github.com/elastic/elasticsearch/issues/136031
555537
- class: org.elasticsearch.xpack.security.authz.microsoft.MicrosoftGraphAuthzPluginIT
556538
method: testConcurrentAuthentication
557539
issue: https://github.com/elastic/elasticsearch/issues/135777
558-
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
559-
method: test {csv-spec:fork.ForkBranchWithInlineStats}
560-
issue: https://github.com/elastic/elasticsearch/issues/136091
561540
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
562541
method: test {csv-spec:date.EvalDateTruncQuarterlyIntervalWithGTInRange}
563542
issue: https://github.com/elastic/elasticsearch/issues/136102

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClusterSpecIT.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.CSV_DATASET_MAP;
4949
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_SOURCE_INDICES;
5050
import static org.elasticsearch.xpack.esql.EsqlTestUtils.classpathResources;
51-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_FORK_FOR_REMOTE_INDICES;
5251
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE;
5352
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
5453
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINE_STATS;
@@ -166,12 +165,7 @@ protected void shouldSkipTest(String testName) throws IOException {
166165
// Tests that do SORT before LOOKUP JOIN - not supported in CCS
167166
assumeFalse("LOOKUP JOIN after SORT not yet supported in CCS", testName.contains("OnTheCoordinator"));
168167

169-
if (testCase.requiredCapabilities.contains(FORK_V9.capabilityName())) {
170-
assumeTrue(
171-
"FORK not yet supported with CCS",
172-
hasCapabilities(adminClient(), List.of(ENABLE_FORK_FOR_REMOTE_INDICES.capabilityName()))
173-
);
174-
}
168+
assumeFalse("FORK not yet supported with CCS", testCase.requiredCapabilities.contains(FORK_V9.capabilityName()));
175169
}
176170

177171
private TestFeatureService remoteFeaturesService() throws IOException {

0 commit comments

Comments
 (0)