Merge pull request #35486 from geoand/#35464

Close DevServices in a timely manner for integration tests
quarkusio · Aug 24, 2023 · 7bcbb88 · 7bcbb88
2 parents 3666595 + ec72175
commit 7bcbb88
Showing 1 changed file with 34 additions and 1 deletion.
diff --git a/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java b/...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
@@ -14,7 +14,9 @@
 import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties;
 import static io.quarkus.test.junit.IntegrationTestUtil.startLauncher;
 
+import java.io.Closeable;
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -40,6 +42,7 @@
 import org.junit.jupiter.api.extension.TestInstancePostProcessor;
 import org.opentest4j.TestAbortedException;
 
+import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.logging.InitialConfigurator;
 import io.quarkus.runtime.logging.JBossVersion;
 import io.quarkus.runtime.test.TestHttpEndpointProvider;
@@ -290,7 +293,9 @@ public void close() throws Throwable {
             activateLogging();
             startLauncher(launcher, additionalProperties, () -> ssl = true);
 
-            IntegrationTestExtensionState state = new IntegrationTestExtensionState(testResourceManager, launcher,
+            Closeable resource = new IntegrationTestExtensionStateResource(launcher,
+                    devServicesLaunchResult.getCuratedApplication());
+            IntegrationTestExtensionState state = new IntegrationTestExtensionState(testResourceManager, resource,
                     sysPropRestore);
             testHttpEndpointProviders = TestHttpEndpointProvider.load();
 
@@ -440,4 +445,32 @@ public Optional<String> containerNetworkId() {
             return containerNetworkId;
         }
     }
+
+    private static final class IntegrationTestExtensionStateResource implements Closeable {
+
+        private final ArtifactLauncher<?> launcher;
+        private final CuratedApplication curatedApplication;
+
+        public IntegrationTestExtensionStateResource(ArtifactLauncher<?> launcher,
+                CuratedApplication curatedApplication) {
+            this.launcher = launcher;
+            this.curatedApplication = curatedApplication;
+        }
+
+        @Override
+        public void close() throws IOException {
+            if (launcher != null) {
+                try {
+                    launcher.close();
+                } catch (Exception e) {
+                    System.err.println("Unable to close ArtifactLauncher: " + e.getMessage());
+                }
+            }
+            try {
+                curatedApplication.close();
+            } catch (Exception e) {
+                System.err.println("Unable to close CuratedApplication: " + e.getMessage());
+            }
+        }
+    }
 }