Merge pull request quarkusio#26933 from geoand/quarkusio#26882

Fix test resource close issues in command mode tests
michalvavrik · Jul 26, 2022 · 06e5acd · 06e5acd
2 parents 872fda2 + 29fe54c
commit 06e5acd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...ework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java b/...ework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
@@ -167,8 +167,12 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
                         System.setProperty(i.getKey(), i.getValue());
                     }
                 }
-                if (testResourceManager != null) {
-                    testResourceManager.close();
+                try {
+                    if (testResourceManager != null) {
+                        testResourceManager.close();
+                    }
+                } catch (Exception e) {
+                    System.err.println("Unable to shutdown resource: " + e.getMessage());
                 }
             }
         } catch (Exception e) {

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
@@ -214,16 +214,16 @@ private int doJavaStart(ExtensionContext context, Class<? extends QuarkusTestPro
             if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
                 activateLogging();
             }
-
+            throw e;
+        } finally {
             try {
                 if (testResourceManager != null) {
                     testResourceManager.close();
                 }
-            } catch (Exception ex) {
-                e.addSuppressed(ex);
+            } catch (Exception e) {
+                System.err.println("Unable to shutdown resource: " + e.getMessage());
             }
-            throw e;
-        } finally {
+
             uninstallLoggerRedirect();
             QuarkusConsole.uninstallRedirects();
             if (originalCl != null) {