Skip to content

Commit aec2e90

Browse files
authored
Unwrap failure in testCancelRequestWhenFailingFetchingPages (#121597) (#121609)
The thrown exception may be wrapped in an ExecutionException; therefore, we need to unwrap it before verification. Closes #121596 Closes #118193
1 parent 17a0828 commit aec2e90

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ tests:
128128
- class: org.elasticsearch.xpack.ml.integration.RegressionIT
129129
method: testTwoJobsWithSameRandomizeSeedUseSameTrainingSet
130130
issue: https://github.com/elastic/elasticsearch/issues/117805
131-
- class: org.elasticsearch.xpack.esql.action.EsqlActionTaskIT
132-
method: testCancelRequestWhenFailingFetchingPages
133-
issue: https://github.com/elastic/elasticsearch/issues/118193
134131
- class: org.elasticsearch.packaging.test.ArchiveTests
135132
method: test44AutoConfigurationNotTriggeredOnNotWriteableConfDir
136133
issue: https://github.com/elastic/elasticsearch/issues/118208

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@ protected void doRun() throws Exception {
462462
}
463463
Exception failure = expectThrows(Exception.class, () -> future.actionGet().close());
464464
EsqlTestUtils.assertEsqlFailure(failure);
465-
assertThat(failure.getMessage(), containsString("failed to fetch pages"));
465+
Throwable cause = ExceptionsHelper.unwrap(failure, IOException.class);
466+
assertNotNull(cause);
467+
assertThat(cause.getMessage(), containsString("failed to fetch pages"));
466468
// If we proceed without waiting for pages, we might cancel the main request before starting the data-node request.
467469
// As a result, the exchange sinks on data-nodes won't be removed until the inactive_timeout elapses, which is
468470
// longer than the assertBusy timeout.

0 commit comments

Comments
 (0)