Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public void testRequestResetAndAbort() throws Exception {
httpGet.abort();
Future<HttpResponse> future = client.execute(httpHost, httpGet, null);
try {
future.get();
future.get(5, TimeUnit.SECONDS);
fail("expected cancellation exception");
} catch (CancellationException e) {
// expected
Expand All @@ -298,7 +298,7 @@ public void testRequestResetAndAbort() throws Exception {
assertTrue(httpGet.isAborted());
try {
assertTrue(future.isDone());
future.get();
future.get(5, TimeUnit.SECONDS);
} catch (CancellationException e) {
// expected sometimes - if the future was cancelled before executing successfully
}
Expand All @@ -308,7 +308,7 @@ public void testRequestResetAndAbort() throws Exception {
assertFalse(httpGet.isAborted());
Future<HttpResponse> future = client.execute(httpHost, httpGet, null);
assertFalse(httpGet.isAborted());
assertEquals(200, future.get().getStatusLine().getStatusCode());
assertEquals(200, future.get(5, TimeUnit.SECONDS).getStatusLine().getStatusCode());
assertFalse(future.isCancelled());
}
}
Expand Down
3 changes: 0 additions & 3 deletions muted-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
tests:
- class: "org.elasticsearch.client.RestClientSingleHostIntegTests"
issue: "https://github.com/elastic/elasticsearch/issues/102717"
method: "testRequestResetAndAbort"
- class: org.elasticsearch.packaging.test.PackagesSecurityAutoConfigurationTests
method: test20SecurityNotAutoConfiguredOnReInstallation
issue: https://github.com/elastic/elasticsearch/issues/112635
Expand Down