Skip to content

Commit 0551355

Browse files
Fix and unmute CrossClusterEsqlRCS1UnavailableRemotesIT tests (elastic#120388)
* Unmute `CrossClusterEsqlRCS1UnavailableRemotesIT.testEsqlRcs1UnavailableRemoteScenarios` * Track `node_not_connected_exception`
1 parent ae7f3b6 commit 0551355

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@ tests:
146146
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
147147
method: testBottomFieldSort
148148
issue: https://github.com/elastic/elasticsearch/issues/118214
149-
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1UnavailableRemotesIT
150-
method: testEsqlRcs1UnavailableRemoteScenarios
151-
issue: https://github.com/elastic/elasticsearch/issues/118350
152149
- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
153150
method: testSearcherId
154151
issue: https://github.com/elastic/elasticsearch/issues/118374

x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/CrossClusterEsqlRCS1UnavailableRemotesIT.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import static org.hamcrest.CoreMatchers.containsString;
2828
import static org.hamcrest.CoreMatchers.is;
29+
import static org.hamcrest.Matchers.anyOf;
2930
import static org.hamcrest.Matchers.greaterThan;
3031

3132
public class CrossClusterEsqlRCS1UnavailableRemotesIT extends AbstractRemoteClusterSecurityTestCase {
@@ -178,7 +179,14 @@ private void remoteClusterShutdownWithSkipUnavailableFalse() throws Exception {
178179
// A simple query that targets our remote cluster.
179180
String query = "FROM *,my_remote_cluster:* | LIMIT 10";
180181
ResponseException ex = expectThrows(ResponseException.class, () -> client().performRequest(esqlRequest(query)));
181-
assertThat(ex.getMessage(), containsString("connect_transport_exception"));
182+
assertThat(
183+
ex.getMessage(),
184+
anyOf(
185+
containsString("connect_transport_exception"),
186+
containsString("node_disconnected_exception"),
187+
containsString("node_not_connected_exception")
188+
)
189+
);
182190
} finally {
183191
fulfillingCluster.start();
184192
closeFulfillingClusterClient();

0 commit comments

Comments
 (0)