This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-0.6 by this push:
new a90cdb85b [#4463] fix(tests): remove the wrong tag on test class
(#4488)
a90cdb85b is described below
commit a90cdb85b5fc855b277897bbb00456c1e000f250
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Aug 12 18:44:27 2024 +0800
[#4463] fix(tests): remove the wrong tag on test class (#4488)
### What changes were proposed in this pull request?
- fix the wrong tag on the test class
### Why are the changes needed?
Fix: #4463
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
exit the Docker daemon and run the build command
Co-authored-by: mchades <[email protected]>
---
.../TestDorisTablePartitionOperations.java | 2 +-
.../integration/test/container/ContainerSuite.java | 22 ++++++++++++++++++++--
.../test/util/CloseContainerExtension.java | 13 +++++++------
.../{RangerIT.java => AbstractRangerIT.java} | 4 ++--
.../test/authorization/ranger/RangerHiveIT.java | 8 ++++----
.../gravitino/integration/test/client/AuditIT.java | 4 +---
.../integration/test/client/MetalakeIT.java | 2 --
.../test/web/rest/KerberosOperationsIT.java | 2 --
.../test/web/rest/OAuth2OperationsIT.java | 2 --
.../test/web/rest/VersionOperationsIT.java | 2 --
.../integration/test/web/ui/MetalakePageTest.java | 4 ++--
11 files changed, 37 insertions(+), 28 deletions(-)
diff --git
a/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/operation/TestDorisTablePartitionOperations.java
b/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/operation/TestDorisTablePartitionOperations.java
index 40cb3254b..ffbcb98d3 100644
---
a/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/operation/TestDorisTablePartitionOperations.java
+++
b/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/operation/TestDorisTablePartitionOperations.java
@@ -57,7 +57,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag("gravitino-docker-it")
+@Tag("gravitino-docker-test")
public class TestDorisTablePartitionOperations extends TestDoris {
private static final String databaseName =
GravitinoITUtils.genRandomName("doris_test_db");
private static final Integer DEFAULT_BUCKET_SIZE = 1;
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
index 00286d045..4f477e136 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
@@ -45,6 +45,7 @@ import org.testcontainers.containers.Network;
public class ContainerSuite implements Closeable {
public static final Logger LOG =
LoggerFactory.getLogger(ContainerSuite.class);
private static volatile ContainerSuite instance = null;
+ private static volatile boolean initialized = false;
// The subnet must match the configuration in
// `dev/docker/tools/mac-docker-connector.conf`
@@ -72,7 +73,11 @@ public class ContainerSuite implements Closeable {
protected static final CloseableGroup closer = CloseableGroup.create();
- private static void init() {
+ private static void initIfNecessary() {
+ if (initialized) {
+ return;
+ }
+
try {
// Check if docker is available and you should never close the global
DockerClient!
DockerClient dockerClient = DockerClientFactory.instance().client();
@@ -82,16 +87,20 @@ public class ContainerSuite implements Closeable {
if
("true".equalsIgnoreCase(System.getenv("NEED_CREATE_DOCKER_NETWORK"))) {
network = createDockerNetwork();
}
+ initialized = true;
} catch (Exception e) {
throw new RuntimeException("Failed to initialize ContainerSuite", e);
}
}
+ public static boolean initialized() {
+ return initialized;
+ }
+
public static ContainerSuite getInstance() {
if (instance == null) {
synchronized (ContainerSuite.class) {
if (instance == null) {
- init();
instance = new ContainerSuite();
}
}
@@ -107,6 +116,7 @@ public class ContainerSuite implements Closeable {
if (hiveContainer == null) {
synchronized (ContainerSuite.class) {
if (hiveContainer == null) {
+ initIfNecessary();
// Start Hive container
HiveContainer.Builder hiveBuilder =
HiveContainer.builder()
@@ -167,6 +177,7 @@ public class ContainerSuite implements Closeable {
if (kerberosHiveContainer == null) {
synchronized (ContainerSuite.class) {
if (kerberosHiveContainer == null) {
+ initIfNecessary();
// Start Hive container
HiveContainer.Builder hiveBuilder =
HiveContainer.builder()
@@ -189,6 +200,7 @@ public class ContainerSuite implements Closeable {
if (trinoContainer == null) {
synchronized (ContainerSuite.class) {
if (trinoContainer == null) {
+ initIfNecessary();
// Start Trino container
String hiveContainerIp = hiveContainer.getContainerIpAddress();
TrinoContainer.Builder trinoBuilder =
@@ -229,6 +241,7 @@ public class ContainerSuite implements Closeable {
if (dorisContainer == null) {
synchronized (ContainerSuite.class) {
if (dorisContainer == null) {
+ initIfNecessary();
// Start Doris container
DorisContainer.Builder dorisBuilder =
DorisContainer.builder().withHostName("gravitino-ci-doris").withNetwork(network);
@@ -244,6 +257,7 @@ public class ContainerSuite implements Closeable {
if (mySQLContainer == null) {
synchronized (ContainerSuite.class) {
if (mySQLContainer == null) {
+ initIfNecessary();
// Start MySQL container
MySQLContainer.Builder mysqlBuilder =
MySQLContainer.builder()
@@ -270,6 +284,7 @@ public class ContainerSuite implements Closeable {
if (mySQLVersion5Container == null) {
synchronized (ContainerSuite.class) {
if (mySQLVersion5Container == null) {
+ initIfNecessary();
// Start MySQL container
MySQLContainer.Builder mysqlBuilder =
MySQLContainer.builder()
@@ -297,6 +312,7 @@ public class ContainerSuite implements Closeable {
if (!pgContainerMap.containsKey(pgImageName)) {
synchronized (ContainerSuite.class) {
if (!pgContainerMap.containsKey(pgImageName)) {
+ initIfNecessary();
// Start PostgreSQL container
PostgreSQLContainer.Builder pgBuilder =
PostgreSQLContainer.builder()
@@ -330,6 +346,7 @@ public class ContainerSuite implements Closeable {
if (kafkaContainer == null) {
synchronized (ContainerSuite.class) {
if (kafkaContainer == null) {
+ initIfNecessary();
KafkaContainer.Builder builder =
KafkaContainer.builder().withNetwork(network);
KafkaContainer container = closer.register(builder.build());
try {
@@ -372,6 +389,7 @@ public class ContainerSuite implements Closeable {
if (rangerContainer == null) {
synchronized (ContainerSuite.class) {
if (rangerContainer == null) {
+ initIfNecessary();
// Start Ranger container
RangerContainer.Builder rangerBuilder =
RangerContainer.builder().withNetwork(network);
RangerContainer container = closer.register(rangerBuilder.build());
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/CloseContainerExtension.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/CloseContainerExtension.java
index f3b3a5b5a..82d823f0e 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/CloseContainerExtension.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/CloseContainerExtension.java
@@ -33,12 +33,13 @@ public class CloseContainerExtension implements
BeforeAllCallback {
@Override
public void beforeAll(ExtensionContext extensionContext) {
// Ensure that the container suite is initialized before closing it
- ContainerSuite.getInstance();
- synchronized (CloseContainerExtension.class) {
- extensionContext
- .getRoot()
- .getStore(ExtensionContext.Namespace.GLOBAL)
- .getOrComputeIfAbsent(CloseableContainer.class);
+ if (ContainerSuite.initialized()) {
+ synchronized (CloseContainerExtension.class) {
+ extensionContext
+ .getRoot()
+ .getStore(ExtensionContext.Namespace.GLOBAL)
+ .getOrComputeIfAbsent(CloseableContainer.class);
+ }
}
}
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/AbstractRangerIT.java
similarity index 99%
rename from
integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerIT.java
rename to
integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/AbstractRangerIT.java
index 90cc1b14f..80c0e4960 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/AbstractRangerIT.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RangerIT {
- private static final Logger LOG = LoggerFactory.getLogger(RangerIT.class);
+public abstract class AbstractRangerIT {
+ private static final Logger LOG =
LoggerFactory.getLogger(AbstractRangerIT.class);
protected static final String RANGER_TRINO_REPO_NAME = "trinoDev";
private static final String RANGER_TRINO_TYPE = "trino";
protected static final String RANGER_HIVE_REPO_NAME = "hiveDev";
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java
index db861699e..1f0116272 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/authorization/ranger/RangerHiveIT.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@Tag("gravitino-docker-test")
-public class RangerHiveIT extends RangerIT {
+public class RangerHiveIT extends AbstractRangerIT {
private static final ContainerSuite containerSuite =
ContainerSuite.getInstance();
private static Connection adminConnection;
private static Connection anonymousConnection;
@@ -49,7 +49,7 @@ public class RangerHiveIT extends RangerIT {
@BeforeAll
public static void setup() {
- RangerIT.setup();
+ AbstractRangerIT.setup();
containerSuite.startHiveRangerContainer(
new HashMap<>(
@@ -62,9 +62,9 @@ public class RangerHiveIT extends RangerIT {
containerSuite.getRangerContainer().getContainerIpAddress(),
RangerContainer.RANGER_SERVER_PORT),
RangerContainer.DOCKER_ENV_RANGER_HIVE_REPOSITORY_NAME,
- RangerIT.RANGER_HIVE_REPO_NAME,
+ AbstractRangerIT.RANGER_HIVE_REPO_NAME,
RangerContainer.DOCKER_ENV_RANGER_HDFS_REPOSITORY_NAME,
- RangerIT.RANGER_HDFS_REPO_NAME,
+ AbstractRangerIT.RANGER_HDFS_REPO_NAME,
HiveContainer.HADOOP_USER_NAME,
adminUser)));
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/client/AuditIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/client/AuditIT.java
index b635dc1f9..c5135b8fe 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/client/AuditIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/client/AuditIT.java
@@ -30,10 +30,8 @@ import org.apache.gravitino.integration.test.util.AbstractIT;
import org.apache.gravitino.utils.RandomNameUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag("gravitino-docker-test")
public class AuditIT extends AbstractIT {
private static final String expectUser = System.getProperty("user.name");
@@ -47,7 +45,7 @@ public class AuditIT extends AbstractIT {
}
@Test
- public void testAuditMetalake() throws Exception {
+ public void testAuditMetalake() {
String metalakeAuditName = RandomNameUtils.genRandomName("metalakeAudit");
String newName = RandomNameUtils.genRandomName("newmetaname");
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/client/MetalakeIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/client/MetalakeIT.java
index 3d87e9d4c..bbd93ff2e 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/client/MetalakeIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/client/MetalakeIT.java
@@ -39,11 +39,9 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-@Tag("gravitino-docker-test")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MetalakeIT extends AbstractIT {
public static String metalakeNameA =
RandomNameUtils.genRandomName("metalakeA");
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/KerberosOperationsIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/KerberosOperationsIT.java
index 16de7b06e..668922352 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/KerberosOperationsIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/KerberosOperationsIT.java
@@ -40,11 +40,9 @@ import org.apache.hadoop.minikdc.KerberosSecurityTestcase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import
org.testcontainers.shaded.com.google.common.util.concurrent.Uninterruptibles;
-@Tag("gravitino-docker-test")
public class KerberosOperationsIT extends AbstractIT {
private static final KerberosSecurityTestcase kdc =
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/OAuth2OperationsIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/OAuth2OperationsIT.java
index e4f10769b..af921acb5 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/OAuth2OperationsIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/OAuth2OperationsIT.java
@@ -36,10 +36,8 @@ import
org.apache.gravitino.integration.test.util.OAuthMockDataProvider;
import org.apache.gravitino.server.authentication.OAuthConfig;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag("gravitino-docker-test")
public class OAuth2OperationsIT extends AbstractIT {
private static final KeyPair keyPair =
Keys.keyPairFor(SignatureAlgorithm.RS256);
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/VersionOperationsIT.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/VersionOperationsIT.java
index 59ba215f9..40c875601 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/VersionOperationsIT.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/rest/VersionOperationsIT.java
@@ -22,10 +22,8 @@ import org.apache.gravitino.client.GravitinoVersion;
import org.apache.gravitino.integration.test.util.AbstractIT;
import org.apache.gravitino.integration.test.util.ITUtils;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag("gravitino-docker-test")
public class VersionOperationsIT extends AbstractIT {
@Test
public void testGetVersion() {
diff --git
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java
index e88949753..6a87c2f68 100644
---
a/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java
+++
b/integration-test/src/test/java/org/apache/gravitino/integration/test/web/ui/MetalakePageTest.java
@@ -23,11 +23,11 @@ import
org.apache.gravitino.integration.test.web.ui.utils.AbstractWebIT;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@Tag("gravitino-docker-test")
+@DisabledIfSystemProperty(named = "testMode", matches = "embedded")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MetalakePageTest extends AbstractWebIT {
private static final String WEB_TITLE = "Gravitino";
