This is an automated email from the ASF dual-hosted git repository.
lidongdai 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 b74adb1798 [Improve][connector-e2e][Hive]Optimize script and method
names (#8249)
b74adb1798 is described below
commit b74adb1798154bf97ef757273dcf83c4b0070e29
Author: Jast <shengh...@apache.org>
AuthorDate: Mon Dec 9 22:57:41 2024 +0800
[Improve][connector-e2e][Hive]Optimize script and method names (#8249)
---
.../org/apache/seatunnel/e2e/connector/hive/HiveIT.java | 9 ++++++++-
.../seatunnel/e2e/connector/hive/HiveKerberosIT.java | 17 ++++++++++++-----
.../{fake_to_hive_on_hdfs.conf => fake_to_hive.conf} | 0
...th_kerberos.conf => fake_to_hive_with_kerberos.conf} | 0
...{hive_on_hdfs_to_assert.conf => hive_to_assert.conf} | 0
..._kerberos.conf => hive_to_assert_with_kerberos.conf} | 0
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveIT.java
index bfa83dfb3b..5307b134b0 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveIT.java
@@ -228,8 +228,15 @@ public class HiveIT extends TestSuiteBase implements
TestResource {
}
@TestTemplate
+ public void testFakeSinkHive(TestContainer container) throws Exception {
+ executeJob(container, "/fake_to_hive.conf", "/hive_to_assert.conf");
+ }
+
+ @TestTemplate
+ @Disabled(
+ "[HDFS/COS/OSS/S3] is not available in CI, if you want to run this
test, please set up your own environment in the test case file,
hadoop_hive_conf_path_local and ip below}")
public void testFakeSinkHiveOnHDFS(TestContainer container) throws
Exception {
- executeJob(container, "/fake_to_hive_on_hdfs.conf",
"/hive_on_hdfs_to_assert.conf");
+ // TODO Add the test case for Hive on HDFS
}
@TestTemplate
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveKerberosIT.java
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveKerberosIT.java
index c2fca452fa..6d85903d89 100644
---
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveKerberosIT.java
+++
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/java/org/apache/seatunnel/e2e/connector/hive/HiveKerberosIT.java
@@ -288,27 +288,27 @@ public class HiveKerberosIT extends SeaTunnelContainer {
}
@Test
- public void testFakeSinkHiveOnHDFS() throws Exception {
+ public void testFakeSinkHive() throws Exception {
copyAbsolutePathToContainer("/tmp/hive.keytab", "/tmp/hive.keytab");
copyFileToContainer("/kerberos/krb5.conf", "/tmp/krb5.conf");
copyFileToContainer("/kerberos/hive-site.xml", "/tmp/hive-site.xml");
Container.ExecResult fakeToHiveWithKerberosResult =
- executeJob("/fake_to_hive_on_hdfs_with_kerberos.conf");
+ executeJob("/fake_to_hive_with_kerberos.conf");
Assertions.assertEquals(0, fakeToHiveWithKerberosResult.getExitCode());
Container.ExecResult hiveToAssertWithKerberosResult =
- executeJob("/hive_on_hdfs_to_assert_with_kerberos.conf");
+ executeJob("/hive_to_assert_with_kerberos.conf");
Assertions.assertEquals(0,
hiveToAssertWithKerberosResult.getExitCode());
- Container.ExecResult fakeToHiveResult =
executeJob("/fake_to_hive_on_hdfs.conf");
+ Container.ExecResult fakeToHiveResult =
executeJob("/fake_to_hive.conf");
Assertions.assertEquals(1, fakeToHiveResult.getExitCode());
Assertions.assertTrue(
fakeToHiveResult
.getStderr()
.contains("Get hive table information from hive
metastore service failed"));
- Container.ExecResult hiveToAssertResult =
executeJob("/hive_on_hdfs_to_assert.conf");
+ Container.ExecResult hiveToAssertResult =
executeJob("/hive_to_assert.conf");
Assertions.assertEquals(1, hiveToAssertResult.getExitCode());
Assertions.assertTrue(
hiveToAssertResult
@@ -316,6 +316,13 @@ public class HiveKerberosIT extends SeaTunnelContainer {
.contains("Get hive table information from hive
metastore service failed"));
}
+ @TestTemplate
+ @Disabled(
+ "[HDFS/COS/OSS/S3] is not available in CI, if you want to run this
test, please set up your own environment in the test case file,
hadoop_hive_conf_path_local and ip below}")
+ public void testFakeSinkHiveOnHDFS(TestContainer container) throws
Exception {
+ // TODO Add the test case for Hive on HDFS
+ }
+
@TestTemplate
@Disabled(
"[HDFS/COS/OSS/S3] is not available in CI, if you want to run this
test, please set up your own environment in the test case file,
hadoop_hive_conf_path_local and ip below}")
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_on_hdfs.conf
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive.conf
similarity index 100%
rename from
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_on_hdfs.conf
rename to
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive.conf
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_on_hdfs_with_kerberos.conf
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_with_kerberos.conf
similarity index 100%
rename from
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_on_hdfs_with_kerberos.conf
rename to
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/fake_to_hive_with_kerberos.conf
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_on_hdfs_to_assert.conf
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_to_assert.conf
similarity index 100%
rename from
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_on_hdfs_to_assert.conf
rename to
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_to_assert.conf
diff --git
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_on_hdfs_to_assert_with_kerberos.conf
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_to_assert_with_kerberos.conf
similarity index 100%
rename from
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_on_hdfs_to_assert_with_kerberos.conf
rename to
seatunnel-e2e/seatunnel-connector-v2-e2e/connector-hive-e2e/src/test/resources/hive_to_assert_with_kerberos.conf
