Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close the delayed log handler if exception #20797

Merged
merged 1 commit into from
Dec 23, 2021
Merged

Close the delayed log handler if exception #20797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.junit.jupiter.api.extension.TestInstancePostProcessor;
import org.opentest4j.TestAbortedException;

import io.quarkus.bootstrap.logging.InitialConfigurator;
import io.quarkus.runtime.test.TestHttpEndpointProvider;
import io.quarkus.test.common.ArtifactLauncher;
import io.quarkus.test.common.DevServicesContext;
Expand Down Expand Up @@ -205,6 +206,9 @@ public void close() throws Throwable {

return state;
} catch (Throwable e) {
if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
activateLogging();
}

try {
if (testResourceManager != null) {
Expand Down
7 changes: 5 additions & 2 deletions test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.quarkus.test.junit;

import static io.quarkus.test.junit.IntegrationTestUtil.activateLogging;
import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources;

import java.io.Closeable;
Expand All @@ -21,6 +22,7 @@
import org.junit.jupiter.api.extension.ParameterResolver;

import io.quarkus.bootstrap.app.StartupAction;
import io.quarkus.bootstrap.logging.InitialConfigurator;
import io.quarkus.deployment.dev.testing.LogCapturingOutputFilter;
import io.quarkus.dev.console.QuarkusConsole;
import io.quarkus.dev.testing.TracingHandler;
Expand All @@ -36,8 +38,6 @@ public class QuarkusMainTestExtension extends AbstractJvmQuarkusTestExtension
public static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace
.create("io.quarkus.test.main.jvm");

private static Map<String, String> devServicesProps;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field was unused.


PrepareResult prepareResult;
private static boolean hasPerTestResources;

Expand Down Expand Up @@ -159,6 +159,9 @@ private int doJavaStart(ExtensionContext context, Class<? extends QuarkusTestPro

return startupAction.runMainClassBlocking(arguments);
} catch (Throwable e) {
if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
activateLogging();
}

try {
if (testResourceManager != null) {
Expand Down
5 changes: 5 additions & 0 deletions test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.quarkus.test.junit;

import static io.quarkus.test.junit.IntegrationTestUtil.activateLogging;
import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources;

import java.io.Closeable;
Expand Down Expand Up @@ -68,6 +69,7 @@
import io.quarkus.bootstrap.app.StartupAction;
import io.quarkus.bootstrap.classloading.ClassPathElement;
import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
import io.quarkus.bootstrap.logging.InitialConfigurator;
import io.quarkus.builder.BuildChainBuilder;
import io.quarkus.builder.BuildContext;
import io.quarkus.builder.BuildStep;
Expand Down Expand Up @@ -305,6 +307,9 @@ public void close() throws IOException {
ExtensionState state = new ExtensionState(testResourceManager, shutdownTask);
return state;
} catch (Throwable e) {
if (!InitialConfigurator.DELAYED_HANDLER.isActivated()) {
activateLogging();
}

try {
if (testResourceManager != null) {
Expand Down