(seatunnel) branch dev updated: [Fix][doris-e2e] Fix flaky Doris e2e tests (#8596)

[fanjia]

This is an automated email from the ASF dual-hosted git repository.

fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 36b3dd21c8 [Fix][doris-e2e] Fix flaky Doris e2e tests (#8596)
36b3dd21c8 is described below

commit 36b3dd21c819bd1a4be50bb270e5bca325357b20
Author: Wanming Shi <1633138...@qq.com>
AuthorDate: Wed Jan 29 16:45:33 2025 +0800

    [Fix][doris-e2e] Fix flaky Doris e2e tests (#8596)
---
 .../org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java  | 8 ++++++++
 .../apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java
index 7fa699d998..d13ff4a501 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java
@@ -26,6 +26,7 @@ import 
org.apache.seatunnel.e2e.common.container.TestContainer;
 import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
 import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestTemplate;
@@ -129,6 +130,13 @@ public class DorisCDCSinkIT extends AbstractDorisIT {
         initializeJdbcTable();
     }
 
+    @AfterAll
+    public void close() {
+        if (MYSQL_CONTAINER != null) {
+            MYSQL_CONTAINER.close();
+        }
+    }
+
     @TestTemplate
     public void testDorisCDCSink(TestContainer container) throws Exception {
 
diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java
index 4f90f53aa3..0eeb2cdbea 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java
@@ -17,8 +17,6 @@
 
 package org.apache.seatunnel.e2e.connector.doris;
 
-import org.apache.seatunnel.shade.com.google.common.collect.Lists;
-
 import 
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlContainer;
 import 
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlVersion;
 import 
org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase;
@@ -80,7 +78,9 @@ public class DorisSchemaChangeIT extends AbstractDorisIT {
     private static final String PROJECTION_QUERY =
             "select 
id,name,description,weight,add_column1,add_column2,add_column3 from %s.%s order 
by id;";
     private static final MySqlContainer MYSQL_CONTAINER = 
createMySqlContainer(MySqlVersion.V8_0);
-    private final UniqueDatabase shopDatabase = new 
UniqueDatabase(MYSQL_CONTAINER, DATABASE);
+    private final UniqueDatabase shopDatabase =
+            new UniqueDatabase(
+                    MYSQL_CONTAINER, DATABASE, MYSQL_USER_NAME, 
MYSQL_USER_PASSWORD, DATABASE);
 
     @TestContainerExtension
     private final ContainerExtendedFactory extendedFactory =
@@ -107,7 +107,6 @@ public class DorisSchemaChangeIT extends AbstractDorisIT {
                         .withLogConsumer(
                                 new Slf4jLogConsumer(
                                         
DockerLoggerFactory.getLogger("mysql-docker-image")));
-        
mySqlContainer.setPortBindings(Lists.newArrayList(String.format("%s:%s", 3306, 
3306)));
         return mySqlContainer;
     }