Skip to content

Commit c2476c8

Browse files
committed
fix: container not ready
1 parent 1e649f8 commit c2476c8

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara620222ContainerTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import lombok.extern.slf4j.Slf4j;
1010
import net.bytebuddy.jar.asm.Opcodes;
1111
import org.junit.jupiter.api.AfterAll;
12+
import org.junit.jupiter.api.BeforeAll;
1213
import org.junit.jupiter.params.ParameterizedTest;
1314
import org.junit.jupiter.params.provider.Arguments;
1415
import org.junit.jupiter.params.provider.MethodSource;
@@ -46,7 +47,7 @@ public class Payara620222ContainerTest {
4647
.withCopyToContainer(glassfishPid, "/fetch_pid.sh")
4748
.withNetwork(network)
4849
.withNetworkAliases("app")
49-
.waitingFor(Wait.forHttp("/app"))
50+
.waitingFor(Wait.forHttp("/app/test"))
5051
.withExposedPorts(8080);
5152

5253
static Stream<Arguments> casesProvider() {
@@ -62,6 +63,11 @@ static Stream<Arguments> casesProvider() {
6263
return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, null, List.of(ShellTool.AntSword));
6364
}
6465

66+
@BeforeAll
67+
static void setup() {
68+
container.waitingFor(Wait.forLogMessage(".*JMXService.*", 1));
69+
}
70+
6571
@AfterAll
6672
static void tearDown() {
6773
String logs = container.getLogs();

integration-test/src/test/java/com/reajason/javaweb/integration/probe/payara/Payara620222ContainerTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.reajason.javaweb.integration.probe.DetectionTool;
77
import lombok.SneakyThrows;
88
import lombok.extern.slf4j.Slf4j;
9+
import org.junit.jupiter.api.BeforeAll;
910
import org.junit.jupiter.api.Test;
1011
import org.objectweb.asm.Opcodes;
1112
import org.testcontainers.containers.GenericContainer;
@@ -32,9 +33,14 @@ public class Payara620222ContainerTest {
3233
@Container
3334
public static final GenericContainer<?> container = new GenericContainer<>(imageName)
3435
.withCopyToContainer(warJakartaFile, "/usr/local/payara6/glassfish/domains/domain1/autodeploy/app.war")
35-
.waitingFor(Wait.forHttp("/app"))
36+
.waitingFor(Wait.forHttp("/app/test"))
3637
.withExposedPorts(8080);
3738

39+
@BeforeAll
40+
static void setup() {
41+
container.waitingFor(Wait.forLogMessage(".*JMXService.*", 1));
42+
}
43+
3844
@Test
3945
void testJDK() {
4046
String url = getUrl(container);

0 commit comments

Comments
 (0)