Skip to content

Commit a68abd6

Browse files
authored
Allow the test to also accept partial, this seems to be normal (#132614) (#132615)
(cherry picked from commit 71ae0cc)
1 parent d21840c commit a68abd6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,6 @@ tests:
328328
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
329329
method: testSearchWhileRelocating
330330
issue: https://github.com/elastic/elasticsearch/issues/128500
331-
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
332-
method: testFailToStartRequestOnRemoteCluster
333-
issue: https://github.com/elastic/elasticsearch/issues/128545
334331
- class: org.elasticsearch.compute.operator.LimitOperatorTests
335332
method: testEarlyTermination
336333
issue: https://github.com/elastic/elasticsearch/issues/128721

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterQueryWithPartialResultsIT.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static org.hamcrest.Matchers.is;
4949
import static org.hamcrest.Matchers.lessThanOrEqualTo;
5050
import static org.hamcrest.Matchers.not;
51+
import static org.hamcrest.Matchers.oneOf;
5152

5253
public class CrossClusterQueryWithPartialResultsIT extends AbstractCrossClusterTestCase {
5354

@@ -295,7 +296,11 @@ public void testFailToStartRequestOnRemoteCluster() throws Exception {
295296
assertThat(returnedIds, equalTo(local.okIds));
296297
assertClusterSuccess(resp, LOCAL_CLUSTER, local.okShards);
297298
EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
298-
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SKIPPED));
299+
// It could also return partial on failure
300+
assertThat(
301+
remoteInfo.getStatus(),
302+
oneOf(EsqlExecutionInfo.Cluster.Status.SKIPPED, EsqlExecutionInfo.Cluster.Status.PARTIAL)
303+
);
299304
assertClusterFailure(resp, REMOTE_CLUSTER_1, simulatedFailure.getMessage());
300305
}
301306
} finally {

0 commit comments

Comments
 (0)