From ad1aca6d7a586e8e4b149f6c9a52837ab7cdb084 Mon Sep 17 00:00:00 2001 From: Luigi Dell'Aquila Date: Mon, 14 Jul 2025 13:18:52 +0200 Subject: [PATCH] ES|QL: fix MultiClustersIT --- muted-tests.yml | 3 --- .../java/org/elasticsearch/test/ESTestCase.java | 1 - .../xpack/esql/ccq/MultiClustersIT.java | 14 ++++++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 91ecd330c2194..edacc550d48b3 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -546,9 +546,6 @@ tests: - class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT method: test issue: https://github.com/elastic/elasticsearch/issues/131154 -- class: org.elasticsearch.xpack.esql.ccq.MultiClustersIT - method: testNotLikeListKeyword - issue: https://github.com/elastic/elasticsearch/issues/131155 - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests method: testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges issue: https://github.com/elastic/elasticsearch/issues/131165 diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index 47ca9e5ee2afc..6ced34ce72759 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -534,7 +534,6 @@ public static void setupEntitlementsForClass() { TestEntitlementBootstrap.setActive(false == withoutEntitlements); TestEntitlementBootstrap.setTriviallyAllowingTestCode(false == withEntitlementsOnTestCode); if (entitledPackages != null) { - assert withEntitlementsOnTestCode == false : "Cannot use @WithEntitlementsOnTestCode together with @EntitledTestPackages"; assert entitledPackages.value().length > 0 : "No test packages specified in @EntitledTestPackages"; TestEntitlementBootstrap.setEntitledTestPackages(entitledPackages.value()); } diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java index 7fa6d789bc8fc..4b6097f27047f 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java +++ b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java @@ -629,10 +629,16 @@ public void testNotLikeListKeyword() throws Exception { """, includeCCSMetadata); var columns = List.of(Map.of("name", "c", "type", "long"), Map.of("name", "_index", "type", "keyword")); Predicate filter = d -> false == (d.color.contains("blue") || d.color.contains("red")); - var values = List.of( - List.of((int) remoteDocs.stream().filter(filter).count(), REMOTE_CLUSTER_NAME + ":" + remoteIndex), - List.of((int) localDocs.stream().filter(filter).count(), localIndex) - ); + + var values = new ArrayList<>(); + int remoteCount = (int) remoteDocs.stream().filter(filter).count(); + int localCount = (int) localDocs.stream().filter(filter).count(); + if (remoteCount > 0) { + values.add(List.of(remoteCount, REMOTE_CLUSTER_NAME + ":" + remoteIndex)); + } + if (localCount > 0) { + values.add(List.of(localCount, localIndex)); + } assertResultMapForLike(includeCCSMetadata, result, columns, values, false, true); }