Merge branch 'main' of https://github.com/elastic/elasticsearch into …

…unmute_match_command_tests
astefan · Aug 8, 2024 · a73432e · a73432e
2 parents 48c19fb + 681e9c1
commit a73432e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -122,9 +122,6 @@ tests:
 - class: org.elasticsearch.xpack.inference.integration.ModelRegistryIT
   method: testGetModel
   issue: https://github.com/elastic/elasticsearch/issues/111570
-- class: org.elasticsearch.rest.ChunkedZipResponseIT
-  method: testAbort
-  issue: https://github.com/elastic/elasticsearch/issues/111698
 
 # Examples:
 #

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/rest/ChunkedZipResponseIT.java b/server/src/internalClusterTest/java/org/elasticsearch/rest/ChunkedZipResponseIT.java
@@ -366,9 +366,9 @@ public void testRandomZipResponse() throws IOException {
                     actualEntries.put(name, bytesStream.bytes());
                 }
             }
+        } finally {
+            assertEquals(getExpectedEntries(), actualEntries);
         }
-
-        assertEquals(getExpectedEntries(), actualEntries);
     }
 
     public void testAbort() throws IOException {
@@ -436,13 +436,16 @@ public boolean cancel() {
             }
         }));
 
-        try (var restClient = createRestClient(internalCluster().getRandomNodeName())) {
-            // one-node REST client to avoid retries
-            expectThrows(ConnectionClosedException.class, () -> restClient.performRequest(request));
+        try {
+            try (var restClient = createRestClient(internalCluster().getRandomNodeName())) {
+                // one-node REST client to avoid retries
+                expectThrows(ConnectionClosedException.class, () -> restClient.performRequest(request));
+            }
+            safeAwait(responseStarted);
+            safeAwait(bodyConsumed);
+        } finally {
+            assertNull(getExpectedEntries()); // mainly just checking that all refs are released
         }
-        safeAwait(responseStarted);
-        safeAwait(bodyConsumed);
-        assertNull(getExpectedEntries()); // mainly just checking that all refs are released
     }
 
     public void testGetNextPartFailure() throws IOException {
@@ -458,8 +461,9 @@ public void testGetNextPartFailure() throws IOException {
                 ),
                 anyOf(instanceOf(ConnectionClosedException.class), instanceOf(MalformedChunkCodingException.class))
             );
+        } finally {
+            assertNull(getExpectedEntries()); // mainly just checking that all refs are released
         }
-        assertNull(getExpectedEntries()); // mainly just checking that all refs are released
     }
 
     private static Map<String, BytesReference> getExpectedEntries() {