Skip to content

Commit cb05732

Browse files
committed
fix: retry when failed
1 parent fd1e3d0 commit cb05732

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10WebSocketBypassNginxTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import lombok.extern.slf4j.Slf4j;
1313
import org.apache.commons.lang3.tuple.Pair;
1414
import org.junit.jupiter.api.Test;
15+
import org.junitpioneer.jupiter.RetryingTest;
1516
import org.objectweb.asm.Opcodes;
1617
import org.testcontainers.containers.ComposeContainer;
1718
import org.testcontainers.junit.jupiter.Container;
@@ -37,7 +38,7 @@ public class Tomcat10WebSocketBypassNginxTest {
3738
new ComposeContainer(new File("docker-compose/tomcat/docker-compose-10.1-jre11-nginx.yaml"))
3839
.withExposedService("nginx", 80);
3940

40-
@Test
41+
@RetryingTest(3)
4142
public void testWs() {
4243
String url = getUrl();
4344
String server = ServerType.TOMCAT;

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8WebSocketBypassNginxTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.reajason.javaweb.packer.Packers;
1212
import lombok.extern.slf4j.Slf4j;
1313
import org.apache.commons.lang3.tuple.Pair;
14-
import org.junit.jupiter.api.Test;
14+
import org.junitpioneer.jupiter.RetryingTest;
1515
import org.objectweb.asm.Opcodes;
1616
import org.testcontainers.containers.ComposeContainer;
1717
import org.testcontainers.junit.jupiter.Container;
@@ -37,7 +37,15 @@ public class Tomcat8WebSocketBypassNginxTest {
3737
new ComposeContainer(new File("docker-compose/tomcat/docker-compose-8-jre8-nginx.yaml"))
3838
.withExposedService("nginx", 80);
3939

40-
@Test
40+
public static String getUrl() {
41+
String host = compose.getServiceHost("nginx", 80);
42+
int port = compose.getServicePort("nginx", 80);
43+
String url = "http://" + host + ":" + port + "/app";
44+
log.info("container started, app url is : {}", url);
45+
return url;
46+
}
47+
48+
@RetryingTest(3)
4149
public void testWs() {
4250
String url = getUrl();
4351
String server = ServerType.TOMCAT;
@@ -59,12 +67,4 @@ public void testWs() {
5967
String response = BlockingJavaWebSocketClient.sendRequestWaitResponseWithHeader(shellUrl, "id", commandConfig.getHeaderName(), commandConfig.getHeaderValue());
6068
assertTrue(response.contains("uid="));
6169
}
62-
63-
public static String getUrl() {
64-
String host = compose.getServiceHost("nginx", 80);
65-
int port = compose.getServicePort("nginx", 80);
66-
String url = "http://" + host + ":" + port + "/app";
67-
log.info("container started, app url is : {}", url);
68-
return url;
69-
}
7070
}

0 commit comments

Comments
 (0)