Skip to content

Commit 71ae0cc

Browse files
authored
Allow the test to also accept partial, this seems to be normal (#132614)
1 parent c5b2973 commit 71ae0cc

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
@@ -304,9 +304,6 @@ tests:
304304
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
305305
method: testSearchWhileRelocating
306306
issue: https://github.com/elastic/elasticsearch/issues/128500
307-
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
308-
method: testFailToStartRequestOnRemoteCluster
309-
issue: https://github.com/elastic/elasticsearch/issues/128545
310307
- class: org.elasticsearch.compute.operator.LimitOperatorTests
311308
method: testEarlyTermination
312309
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
@@ -44,6 +44,7 @@
4444
import static org.hamcrest.Matchers.is;
4545
import static org.hamcrest.Matchers.lessThanOrEqualTo;
4646
import static org.hamcrest.Matchers.not;
47+
import static org.hamcrest.Matchers.oneOf;
4748

4849
public class CrossClusterQueryWithPartialResultsIT extends AbstractCrossClusterTestCase {
4950

@@ -291,7 +292,11 @@ public void testFailToStartRequestOnRemoteCluster() throws Exception {
291292
assertThat(returnedIds, equalTo(local.okIds));
292293
assertClusterSuccess(resp, LOCAL_CLUSTER, local.okShards);
293294
EsqlExecutionInfo.Cluster remoteInfo = resp.getExecutionInfo().getCluster(REMOTE_CLUSTER_1);
294-
assertThat(remoteInfo.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SKIPPED));
295+
// It could also return partial on failure
296+
assertThat(
297+
remoteInfo.getStatus(),
298+
oneOf(EsqlExecutionInfo.Cluster.Status.SKIPPED, EsqlExecutionInfo.Cluster.Status.PARTIAL)
299+
);
295300
assertClusterFailure(resp, REMOTE_CLUSTER_1, simulatedFailure.getMessage());
296301
}
297302
} finally {

0 commit comments

Comments
 (0)