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 f6a1e51b89 [E2E] Enable JdbcPostgresIdentifierIT (#7326)
f6a1e51b89 is described below
commit f6a1e51b890582f1cf785a40b4bb38564c5652f8
Author: hailin0 <[email protected]>
AuthorDate: Wed Aug 7 12:44:13 2024 +0800
[E2E] Enable JdbcPostgresIdentifierIT (#7326)
---
.../connectors/seatunnel/jdbc/JdbcPostgresIdentifierIT.java | 6 ------
.../connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java | 3 ++-
.../connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java | 3 ++-
.../apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java | 8 ++++----
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIdentifierIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIdentifierIT.java
index 13adec7008..a7094044aa 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIdentifierIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcPostgresIdentifierIT.java
@@ -20,9 +20,7 @@ package org.apache.seatunnel.connectors.seatunnel.jdbc;
import org.apache.seatunnel.e2e.common.TestResource;
import org.apache.seatunnel.e2e.common.TestSuiteBase;
import org.apache.seatunnel.e2e.common.container.ContainerExtendedFactory;
-import org.apache.seatunnel.e2e.common.container.EngineType;
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;
@@ -53,10 +51,6 @@ import java.util.stream.Stream;
import static org.awaitility.Awaitility.given;
@Slf4j
-@DisabledOnContainer(
- value = {},
- type = {EngineType.SPARK, EngineType.FLINK},
- disabledReason = "Currently SPARK and FLINK do not support cdc")
public class JdbcPostgresIdentifierIT extends TestSuiteBase implements
TestResource {
private static final String PG_IMAGE = "postgis/postgis";
private static final String PG_DRIVER_JAR =
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
index 7397362f35..30c6783897 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMySqlCreateTableIT.java
@@ -59,7 +59,8 @@ import java.util.stream.Stream;
@DisabledOnContainer(
value = {},
type = {EngineType.SPARK, EngineType.FLINK},
- disabledReason = "Currently SPARK and FLINK do not support cdc")
+ disabledReason =
+ "Currently testcase does not depend on a specific engine, but
needs to be started with the engine")
public class JdbcMySqlCreateTableIT extends TestSuiteBase implements
TestResource {
private static final String SQLSERVER_IMAGE =
"mcr.microsoft.com/mssql/server:2022-latest";
private static final String SQLSERVER_CONTAINER_HOST = "sqlserver";
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
index ac8d7e31c8..ae2e625b15 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-4/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcSqlServerCreateTableIT.java
@@ -59,7 +59,8 @@ import java.util.stream.Stream;
@DisabledOnContainer(
value = {},
type = {EngineType.SPARK, EngineType.FLINK},
- disabledReason = "Currently SPARK and FLINK do not support cdc")
+ disabledReason =
+ "Currently testcase does not depend on a specific engine, but
needs to be started with the engine")
public class JdbcSqlServerCreateTableIT extends TestSuiteBase implements
TestResource {
private static final String SQLSERVER_IMAGE =
"mcr.microsoft.com/mssql/server:2022-latest";
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java
index 8fff364c3f..b99c823de8 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-7/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcIrisIT.java
@@ -66,10 +66,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-@DisabledOnContainer(
- value = {},
- type = {EngineType.SPARK},
- disabledReason = "Currently SPARK do not support cdc, temporarily
disable")
@Slf4j
public class JdbcIrisIT extends AbstractJdbcIT {
private static final String IRIS_IMAGE =
"intersystems/iris-community:2023.1";
@@ -322,6 +318,10 @@ public class JdbcIrisIT extends AbstractJdbcIT {
Assertions.assertFalse(catalog.tableExists(targetTablePath));
}
+ @DisabledOnContainer(
+ value = {},
+ type = {EngineType.SPARK},
+ disabledReason = "Currently SPARK do not support cdc")
@TestTemplate
public void testUpsert(TestContainer container) throws IOException,
InterruptedException {
Container.ExecResult execResult =
container.executeJob("/jdbc_iris_upsert.conf");