Merge pull request #44638 from geoand/#44117

Clean up effects of test profiles when @QuarkusMainTest completes
quarkusio · Nov 25, 2024 · 9361824 · 9361824
2 parents 192a870 + 71804eb
commit 9361824
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
@@ -43,6 +43,7 @@ public class QuarkusMainTestExtension extends AbstractJvmQuarkusTestExtension
         AfterAllCallback, ExecutionCondition {
 
     PrepareResult prepareResult;
+    LinkedBlockingDeque<Runnable> shutdownTasks;
 
     /**
      * The result from an {@link Launch} test
@@ -79,9 +80,8 @@ private void ensurePrepared(ExtensionContext extensionContext, Class<? extends Q
             prepareResult = null;
         }
         if (prepareResult == null) {
-            final LinkedBlockingDeque<Runnable> shutdownTasks = new LinkedBlockingDeque<>();
-            PrepareResult result = createAugmentor(extensionContext, profile, shutdownTasks);
-            prepareResult = result;
+            shutdownTasks = new LinkedBlockingDeque<>();
+            prepareResult = createAugmentor(extensionContext, profile, shutdownTasks);
         }
     }
 
@@ -318,6 +318,17 @@ private boolean isIntegrationTest(Class<?> clazz) {
     @Override
     public void afterAll(ExtensionContext context) throws Exception {
         currentTestClassStack.pop();
+
+        try {
+            if (shutdownTasks != null) {
+                for (Runnable shutdownTask : shutdownTasks) {
+                    shutdownTask.run();
+                }
+            }
+            shutdownTasks = null;
+        } catch (Exception e) {
+            System.err.println("Unable to run shutdown tasks: " + e.getMessage());
+        }
     }
 
     @Override