Merge pull request #6017 from gaol/WFCORE-6732

[WFCORE-6732] WildFlyRunner doesn't call tearDown and completed ServerSetupTasks if a later one fails in setup
wildfly · Jun 5, 2024 · ae21704 · ae21704
2 parents 21ff0a1 + 42826f6
commit ae21704
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/testsuite/test-runner/src/main/java/org/wildfly/core/testrunner/WildFlyRunner.java b/testsuite/test-runner/src/main/java/org/wildfly/core/testrunner/WildFlyRunner.java
@@ -184,17 +184,34 @@ public void testRunFinished(Result result) throws Exception {
             Security.insertProviderAt(ELYTRON_PROVIDER, 0);
             providerInstalled = true;
         }
+        RuntimeException setupException = null;
         try {
             if (automaticServerControl) {
                 runSetupTasks();
             }
         } catch (AssumptionViolatedException e) {
             assumptionFailedInServerSetup = e;
+        } catch (RuntimeException e) {
+            setupException = e;
+        }
+        if (setupException == null) {
+            super.run(notifier);
         }
-        super.run(notifier);
 
         if (automaticServerControl) {
-            runTearDownTasks();
+            RuntimeException tearDownException = null;
+            try {
+                runTearDownTasks();
+            } catch (RuntimeException e) {
+                tearDownException = e;
+            } finally {
+                if (setupException != null) {
+                    throw setupException;
+                }
+                if (tearDownException != null) {
+                    throw tearDownException;
+                }
+            }
         }
         if (providerInstalled) {
             Security.removeProvider(ELYTRON_PROVIDER.getName());