Skip to content

Commit 1d3a1da

Browse files
committed
test: pid fetch failed
1 parent 1f51ddc commit 1d3a1da

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
pgrep -a java | awk '{print $1}' | tr -d '\n'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
pgrep -a java | awk '{print $1}' | tr -d '\n'
2+
jps | grep -E "jar" | awk '{print $1}' | tr -d '\n'

integration-test/src/test/java/com/reajason/javaweb/integration/ContainerTool.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class ContainerTool {
3838
public static final MountableFile webspherePid = MountableFile.forHostPath(Path.of("script", "websphere_pid.sh"));
3939
public static final MountableFile weblogicPid = MountableFile.forHostPath(Path.of("script", "weblogic_pid.sh"));
4040
public static final MountableFile springbootPid = MountableFile.forHostPath(Path.of("script", "springboot_pid.sh"));
41+
public static final MountableFile javaPid = MountableFile.forHostPath(Path.of("script", "java_pid.sh"));
4142

4243
public static String getUrl(GenericContainer<?> container) {
4344
int port = container.getMappedPort(8080);

integration-test/src/test/java/com/reajason/javaweb/integration/springwebmvc/SpringBoot2ContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SpringBoot2ContainerTest {
4545
public final static GenericContainer<?> container = new GenericContainer<>(new ImageFromDockerfile()
4646
.withDockerfile(springBoot2Dockerfile))
4747
.withCopyToContainer(jattachFile, "/jattach")
48-
.withCopyToContainer(springbootPid, "/fetch_pid.sh")
48+
.withCopyToContainer(javaPid, "/fetch_pid.sh")
4949
.withNetwork(network)
5050
.withNetworkAliases("app")
5151
.waitingFor(Wait.forHttp("/test"))

0 commit comments

Comments
 (0)