Skip to content

Commit 790f37c

Browse files
authored
fix testServerCloseConnectionMidStream (#116792)
1 parent e66b206 commit 790f37c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4IncrementalRequestHandlingIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ public void testServerCloseConnectionMidStream() throws Exception {
210210
// terminate connection on server and wait resources are released
211211
handler.channel.request().getHttpChannel().close();
212212
assertBusy(() -> {
213-
assertNull(handler.stream.buf());
213+
// Cannot be simplified to assertNull.
214+
// assertNull requires object to not fail on toString() method, but closing buffer can
215+
assertTrue(handler.stream.buf() == null);
214216
assertTrue(handler.streamClosed);
215217
});
216218
}

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ tests:
232232
issue: https://github.com/elastic/elasticsearch/issues/116730
233233
- class: org.elasticsearch.xpack.security.authc.ldap.ActiveDirectoryGroupsResolverTests
234234
issue: https://github.com/elastic/elasticsearch/issues/116182
235-
- class: org.elasticsearch.http.netty4.Netty4IncrementalRequestHandlingIT
236-
method: testServerCloseConnectionMidStream
237-
issue: https://github.com/elastic/elasticsearch/issues/116774
238235
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
239236
method: test {p0=snapshot/20_operator_privileges_disabled/Operator only settings can be set and restored by non-operator user when operator privileges is disabled}
240237
issue: https://github.com/elastic/elasticsearch/issues/116775

0 commit comments

Comments
 (0)