Skip to content

Commit 36b3dd2

Browse files
authored
[Fix][doris-e2e] Fix flaky Doris e2e tests (#8596)
1 parent 06b2fc0 commit 36b3dd2

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Diff for: seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
2727
import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
2828

29+
import org.junit.jupiter.api.AfterAll;
2930
import org.junit.jupiter.api.Assertions;
3031
import org.junit.jupiter.api.BeforeAll;
3132
import org.junit.jupiter.api.TestTemplate;
@@ -129,6 +130,13 @@ public void init() {
129130
initializeJdbcTable();
130131
}
131132

133+
@AfterAll
134+
public void close() {
135+
if (MYSQL_CONTAINER != null) {
136+
MYSQL_CONTAINER.close();
137+
}
138+
}
139+
132140
@TestTemplate
133141
public void testDorisCDCSink(TestContainer container) throws Exception {
134142

Diff for: seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package org.apache.seatunnel.e2e.connector.doris;
1919

20-
import org.apache.seatunnel.shade.com.google.common.collect.Lists;
21-
2220
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlContainer;
2321
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlVersion;
2422
import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase;
@@ -80,7 +78,9 @@ public class DorisSchemaChangeIT extends AbstractDorisIT {
8078
private static final String PROJECTION_QUERY =
8179
"select id,name,description,weight,add_column1,add_column2,add_column3 from %s.%s order by id;";
8280
private static final MySqlContainer MYSQL_CONTAINER = createMySqlContainer(MySqlVersion.V8_0);
83-
private final UniqueDatabase shopDatabase = new UniqueDatabase(MYSQL_CONTAINER, DATABASE);
81+
private final UniqueDatabase shopDatabase =
82+
new UniqueDatabase(
83+
MYSQL_CONTAINER, DATABASE, MYSQL_USER_NAME, MYSQL_USER_PASSWORD, DATABASE);
8484

8585
@TestContainerExtension
8686
private final ContainerExtendedFactory extendedFactory =
@@ -107,7 +107,6 @@ private static MySqlContainer createMySqlContainer(MySqlVersion version) {
107107
.withLogConsumer(
108108
new Slf4jLogConsumer(
109109
DockerLoggerFactory.getLogger("mysql-docker-image")));
110-
mySqlContainer.setPortBindings(Lists.newArrayList(String.format("%s:%s", 3306, 3306)));
111110
return mySqlContainer;
112111
}
113112

0 commit comments

Comments
 (0)