fix integ test cleanup

Signed-off-by: bansvaru <bansvaru@amazon.com>
opensearch-project · Oct 17, 2023 · 9006f52 · 9006f52
1 parent a4390c6
commit 9006f52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java b/...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
@@ -311,9 +311,6 @@ protected Settings remoteStoreIndexSettings(int numberOfReplicas, long totalFiel
     @After
     public void teardown() {
         clusterSettingsSuppliedByTest = false;
-        if (internalCluster().getNodeNames().length == 0) {
-            return;
-        }
         assertRemoteStoreRepositoryOnAllNodes(REPOSITORY_NAME);
         assertRemoteStoreRepositoryOnAllNodes(REPOSITORY_2_NAME);
         clusterAdmin().prepareCleanupRepository(REPOSITORY_NAME).get();

diff --git a/...internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java b/...internalClusterTest/java/org/opensearch/remotestore/RemoteStoreClusterStateRestoreIT.java
@@ -138,6 +138,10 @@ public void testFullClusterRestoreManifestFilePointsToInvalidIndexMetadataPathTh
             throw new RuntimeException(e);
         }
         assertThrows(IllegalStateException.class, () -> addNewNodes(dataNodeCount, clusterManagerNodeCount));
+        // Test is complete
+
+        // Starting a node without remote state to ensure test cleanup
+        internalCluster().startNode(Settings.builder().put(REMOTE_CLUSTER_STATE_ENABLED_SETTING.getKey(), false).build());
     }
 
     public void testRemoteStateFullRestart() throws Exception {