Remove empty if/try-finally in base integ test class (opensearch-proj…

…ect#9098) (opensearch-project#9102) The [commit to comment out `forceFailure()`][1] was done about 8 years ago so I don't think we'll be bringing it back. Also this makes the code base a slightly friendlier place :) [1]: opensearch-project@e5a699f (cherry picked from commit 6e51c47) Signed-off-by: Andrew Ross <[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>
nknize · Aug 4, 2023 · 37662a7 · 37662a7
1 parent ec790f5
commit 37662a7
Showing 1 changed file with 21 additions and 31 deletions.
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
@@ -597,44 +597,34 @@ private static void clearClusters() throws Exception {
     }
 
     private void afterInternal(boolean afterClass) throws Exception {
-        boolean success = false;
+        final Scope currentClusterScope = getCurrentClusterScope();
+        if (isInternalCluster()) {
+            internalCluster().clearDisruptionScheme();
+        }
         try {
-            final Scope currentClusterScope = getCurrentClusterScope();
-            if (isInternalCluster()) {
-                internalCluster().clearDisruptionScheme();
-            }
-            try {
-                if (cluster() != null) {
-                    if (currentClusterScope != Scope.TEST) {
-                        Metadata metadata = client().admin().cluster().prepareState().execute().actionGet().getState().getMetadata();
+            if (cluster() != null) {
+                if (currentClusterScope != Scope.TEST) {
+                    Metadata metadata = client().admin().cluster().prepareState().execute().actionGet().getState().getMetadata();
 
-                        final Set<String> persistentKeys = new HashSet<>(metadata.persistentSettings().keySet());
-                        assertThat("test leaves persistent cluster metadata behind", persistentKeys, empty());
+                    final Set<String> persistentKeys = new HashSet<>(metadata.persistentSettings().keySet());
+                    assertThat("test leaves persistent cluster metadata behind", persistentKeys, empty());
 
-                        final Set<String> transientKeys = new HashSet<>(metadata.transientSettings().keySet());
-                        assertThat("test leaves transient cluster metadata behind", transientKeys, empty());
-                    }
-                    ensureClusterSizeConsistency();
-                    ensureClusterStateConsistency();
-                    ensureClusterStateCanBeReadByNodeTool();
-                    beforeIndexDeletion();
-                    cluster().wipe(excludeTemplates()); // wipe after to make sure we fail in the test that didn't ack the delete
-                    if (afterClass || currentClusterScope == Scope.TEST) {
-                        cluster().close();
-                    }
-                    cluster().assertAfterTest();
+                    final Set<String> transientKeys = new HashSet<>(metadata.transientSettings().keySet());
+                    assertThat("test leaves transient cluster metadata behind", transientKeys, empty());
                 }
-            } finally {
-                if (currentClusterScope == Scope.TEST) {
-                    clearClusters(); // it is ok to leave persistent / transient cluster state behind if scope is TEST
+                ensureClusterSizeConsistency();
+                ensureClusterStateConsistency();
+                ensureClusterStateCanBeReadByNodeTool();
+                beforeIndexDeletion();
+                cluster().wipe(excludeTemplates()); // wipe after to make sure we fail in the test that didn't ack the delete
+                if (afterClass || currentClusterScope == Scope.TEST) {
+                    cluster().close();
                 }
+                cluster().assertAfterTest();
             }
-            success = true;
         } finally {
-            if (!success) {
-                // if we failed here that means that something broke horribly so we should clear all clusters
-                // TODO: just let the exception happen, WTF is all this horseshit
-                // afterTestRule.forceFailure();
+            if (currentClusterScope == Scope.TEST) {
+                clearClusters(); // it is ok to leave persistent / transient cluster state behind if scope is TEST
             }
         }
     }