From 231ba959d4042a6005679a6acf322bfd558d3947 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis <geoand@gmail.com> Date: Mon, 13 Sep 2021 18:04:01 +0300 Subject: [PATCH] Use proper wait-time for jar and docker launch modes. This was already done for native launcher, but it was mistakenly left out for these launch modes. Relates to #17767 (cherry picked from commit bdfb7bf56e48905a2bbde38bea654488c8e63a5e) --- .../test/junit/launcher/DockerContainerLauncherProvider.java | 5 +---- .../io/quarkus/test/junit/launcher/JarLauncherProvider.java | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java index 42ee2aa4df5dc..6f3faee0b65ce 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java @@ -2,13 +2,11 @@ import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_HTTPS_PORT; import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_PORT; -import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_WAIT_TIME_SECONDS; import java.time.Duration; import java.util.Iterator; import java.util.List; import java.util.OptionalInt; -import java.util.OptionalLong; import java.util.ServiceLoader; import org.eclipse.microprofile.config.Config; @@ -43,8 +41,7 @@ public DockerContainerArtifactLauncher create(CreateContext context) { launcher.init(new DefaultDockerInitContext( config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT), config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT), - Duration.ofSeconds(config.getValue("quarkus.test.jar-wait-time", OptionalLong.class) - .orElse(DEFAULT_WAIT_TIME_SECONDS)), + ConfigUtil.waitTimeValue(config), config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null), ConfigUtil.argLineValue(config), context.devServicesLaunchResult(), diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java index 0e2f27150e056..4f84518732afa 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java @@ -2,14 +2,12 @@ import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_HTTPS_PORT; import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_PORT; -import static io.quarkus.test.junit.IntegrationTestUtil.DEFAULT_WAIT_TIME_SECONDS; import java.nio.file.Path; import java.time.Duration; import java.util.Iterator; import java.util.List; import java.util.OptionalInt; -import java.util.OptionalLong; import java.util.ServiceLoader; import org.eclipse.microprofile.config.Config; @@ -43,8 +41,7 @@ public JarArtifactLauncher create(CreateContext context) { launcher.init(new DefaultJarInitContext( config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT), config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT), - Duration.ofSeconds(config.getValue("quarkus.test.jar-wait-time", OptionalLong.class) - .orElse(DEFAULT_WAIT_TIME_SECONDS)), + ConfigUtil.waitTimeValue(config), config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null), ConfigUtil.argLineValue(config), context.devServicesLaunchResult(),