Assert after test before cluster close

albertzaharovits · albertzaharovits · commit db8dac7421a0 · 2025-02-14T20:56:04.000+02:00
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
@@ -585,10 +585,10 @@ private void afterInternal(boolean afterClass) throws Exception {
                     ensureClusterInfoServiceRunning();
                     beforeIndexDeletion();
                     cluster().wipe(excludeTemplates()); // wipe after to make sure we fail in the test that didn't ack the delete
+                    cluster().assertAfterTest();
                     if (afterClass || currentClusterScope == Scope.TEST) {
                         cluster().close();
                     }
-                    cluster().assertAfterTest();
                 }
             } finally {
                 if (currentClusterScope == Scope.TEST) {

Original file line number	Diff line number	Diff line change
`@@ -585,10 +585,10 @@ private void afterInternal(boolean afterClass) throws Exception {`
`585`	`585`	`ensureClusterInfoServiceRunning();`
`586`	`586`	`beforeIndexDeletion();`
`587`	`587`	`cluster().wipe(excludeTemplates()); // wipe after to make sure we fail in the test that didn't ack the delete`
	`588`	`+ cluster().assertAfterTest();`
`588`	`589`	`if (afterClass \|\| currentClusterScope == Scope.TEST) {`
`589`	`590`	`cluster().close();`
`590`	`591`	`}`
`591`		`- cluster().assertAfterTest();`
`592`	`592`	`}`
`593`	`593`	`} finally {`
`594`	`594`	`if (currentClusterScope == Scope.TEST) {`