Consolidate cleanup for Azure blob tests (#16789) (#16811)

(cherry picked from commit 2d18c34) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Dec 9, 2024 · 9ed0b86 · 9ed0b86
1 parent aac4041
commit 9ed0b86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/...azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
@@ -89,6 +89,7 @@
 
 import fixture.azure.AzureHttpHandler;
 import reactor.core.scheduler.Schedulers;
+import reactor.netty.http.HttpResources;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.opensearch.repositories.azure.AzureRepository.Repository.CONTAINER_SETTING;
@@ -143,6 +144,7 @@ public void tearDown() throws Exception {
 
     @AfterClass
     public static void shutdownSchedulers() {
+        HttpResources.disposeLoopsAndConnections();
         Schedulers.shutdownNow();
     }
 

diff --git a/...y-azure/src/test/java/org/opensearch/repositories/azure/AzureRepositorySettingsTests.java b/...y-azure/src/test/java/org/opensearch/repositories/azure/AzureRepositorySettingsTests.java
@@ -49,6 +49,7 @@
 import java.util.List;
 
 import reactor.core.scheduler.Schedulers;
+import reactor.netty.http.HttpResources;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
@@ -57,6 +58,7 @@
 public class AzureRepositorySettingsTests extends OpenSearchTestCase {
     @AfterClass
     public static void shutdownSchedulers() {
+        HttpResources.disposeLoopsAndConnections();
         Schedulers.shutdownNow();
     }
 

diff --git a/...itory-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java b/...itory-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java
@@ -43,7 +43,6 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
-import org.junit.After;
 import org.junit.AfterClass;
 
 import java.io.IOException;
@@ -71,19 +70,10 @@
 public class AzureStorageServiceTests extends OpenSearchTestCase {
     @AfterClass
     public static void shutdownSchedulers() {
+        HttpResources.disposeLoopsAndConnections();
         Schedulers.shutdownNow();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        try {
-            // Properly shut down resources
-            HttpResources.disposeLoopsAndConnectionsLater().block();
-        } finally {
-            super.tearDown();
-        }
-    }
-
     public void testReadSecuredSettings() {
         final Settings settings = Settings.builder()
             .setSecureSettings(buildSecureSettings())