Skip to content

Commit 6873e7e

Browse files
committed
[Fix][CI] Upgrade all-connectors-it-3/7 timeout
1 parent 8905f2b commit 6873e7e

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/rest/BaseServletTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.seatunnel.engine.server.SeaTunnelServerStarter;
3030
import org.apache.seatunnel.engine.server.TestUtils;
3131

32+
import org.junit.jupiter.api.AfterAll;
3233
import org.junit.jupiter.api.Assertions;
3334
import org.junit.jupiter.api.BeforeAll;
3435
import org.junit.jupiter.api.Test;
@@ -43,6 +44,7 @@
4344
class BaseServletTest extends AbstractSeaTunnelServerTest {
4445

4546
private static final int HTTP_PORT = 18080;
47+
private static SeaTunnelConfig seaTunnelConfig;
4648

4749
private static final Long JOB_1 = System.currentTimeMillis() + 1L;
4850

@@ -51,7 +53,7 @@ void setUp() {
5153
String name = this.getClass().getName();
5254
Config hazelcastConfig = Config.loadFromString(getHazelcastConfig());
5355
hazelcastConfig.setClusterName(TestUtils.getClusterName("RestApiServletTest_" + name));
54-
SeaTunnelConfig seaTunnelConfig = loadSeaTunnelConfig();
56+
seaTunnelConfig = loadSeaTunnelConfig();
5557
seaTunnelConfig.setHazelcastConfig(hazelcastConfig);
5658
seaTunnelConfig.getEngineConfig().setMode(ExecutionMode.LOCAL);
5759

@@ -65,6 +67,12 @@ void setUp() {
6567
LOGGER = nodeEngine.getLogger(AbstractSeaTunnelServerTest.class);
6668
}
6769

70+
@AfterAll
71+
public void resetConfig() {
72+
seaTunnelConfig.getEngineConfig().getHttpConfig().setEnabled(false);
73+
seaTunnelConfig.getEngineConfig().getHttpConfig().setEnableHttps(false);
74+
}
75+
6876
@Test
6977
void testWriteJsonWithObject() throws IOException {
7078
startJob(JOB_1, "fake_to_console.conf");

seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/rest/RestApiHttpsForTruststoreTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.seatunnel.engine.server.SeaTunnelServerStarter;
2626
import org.apache.seatunnel.engine.server.TestUtils;
2727

28+
import org.junit.jupiter.api.AfterAll;
2829
import org.junit.jupiter.api.Assertions;
2930
import org.junit.jupiter.api.BeforeAll;
3031
import org.junit.jupiter.api.Test;
@@ -48,6 +49,7 @@
4849
@DisabledOnOs(OS.WINDOWS)
4950
public class RestApiHttpsForTruststoreTest extends AbstractSeaTunnelServerTest {
5051
private int httpPort;
52+
private static SeaTunnelConfig seaTunnelConfig;
5153
private static final int HTTPS_PORT = 18443;
5254
private static final String SERVER_KEYSTORE_PASSWORD = "server_keystore_password";
5355
private static final String SERVER_TRUSTSTORE_PASSWORD = "server_truststore_password";
@@ -60,7 +62,7 @@ public void setUp() {
6062
Config hazelcastConfig = Config.loadFromString(getHazelcastConfig());
6163
hazelcastConfig.setClusterName(
6264
TestUtils.getClusterName("RestApiHttpsForTruststoreTest_" + name));
63-
SeaTunnelConfig seaTunnelConfig = loadSeaTunnelConfig();
65+
seaTunnelConfig = loadSeaTunnelConfig();
6466
seaTunnelConfig.setHazelcastConfig(hazelcastConfig);
6567
seaTunnelConfig.getEngineConfig().setMode(ExecutionMode.LOCAL);
6668

@@ -85,6 +87,12 @@ public void setUp() {
8587
LOGGER = nodeEngine.getLogger(AbstractSeaTunnelServerTest.class);
8688
}
8789

90+
@AfterAll
91+
public void resetConfig() {
92+
seaTunnelConfig.getEngineConfig().getHttpConfig().setEnabled(false);
93+
seaTunnelConfig.getEngineConfig().getHttpConfig().setEnableHttps(false);
94+
}
95+
8896
public String getPath(String confFile) {
8997
return System.getProperty("user.dir") + "/src/test/resources/https/" + confFile;
9098
}

0 commit comments

Comments
 (0)