Skip to content

Commit a1f934f

Browse files
authored
Relax exception condition on testFilterWithUnavailableRemote (#135797)
* Sometimes it throws IllegalStateException. I don't think we care
1 parent 310a1d4 commit a1f934f

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,6 @@ tests:
429429
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
430430
method: testCancelViaExpirationOnRemoteResultsWithMinimizeRoundtrips
431431
issue: https://github.com/elastic/elasticsearch/issues/127302
432-
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithFiltersIT
433-
method: testFilterWithUnavailableRemote
434-
issue: https://github.com/elastic/elasticsearch/issues/133450
435432
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT
436433
method: test {p0=esql/60_usage/*}
437434
issue: https://github.com/elastic/elasticsearch/issues/133461

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.esql.action;
99

10-
import org.elasticsearch.ElasticsearchException;
1110
import org.elasticsearch.client.internal.Client;
1211
import org.elasticsearch.cluster.RemoteException;
1312
import org.elasticsearch.common.Strings;
@@ -420,11 +419,11 @@ private void checkRemoteFailures() {
420419
new RangeQueryBuilder("@timestamp").from("2025-01-01").to("now")
421420
)) {
422421
// One index
423-
var e = expectThrows(ElasticsearchException.class, () -> runQuery("from cluster-a:log-2", randomBoolean(), filter).close());
422+
var e = expectThrows(RuntimeException.class, () -> runQuery("from cluster-a:log-2", randomBoolean(), filter).close());
424423
// Two indices
425-
e = expectThrows(ElasticsearchException.class, () -> runQuery("from logs-1,cluster-a:log-2", randomBoolean(), filter).close());
424+
e = expectThrows(RuntimeException.class, () -> runQuery("from logs-1,cluster-a:log-2", randomBoolean(), filter).close());
426425
// Wildcard
427-
e = expectThrows(ElasticsearchException.class, () -> runQuery("from logs-1,cluster-a:log*", randomBoolean(), filter).close());
426+
e = expectThrows(RuntimeException.class, () -> runQuery("from logs-1,cluster-a:log*", randomBoolean(), filter).close());
428427
}
429428
}
430429

0 commit comments

Comments
 (0)