test: disable crud tests

Alex-pvl · Alex-pvl · commit 86176806d7ce · 2026-02-12T07:36:39.000+03:00
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientTest.java
@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -85,6 +86,7 @@
 import io.tarantool.pool.IProtoClientPool;
 import io.tarantool.pool.InstanceConnectionGroup;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 10)
 @Testcontainers
 public class TarantoolCrudClientTest extends BaseTest {
diff --git a/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java b/tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolCrudClientWithRetryTest.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
@@ -35,6 +36,7 @@
 import io.tarantool.core.exceptions.BoxError;
 import io.tarantool.mapping.Tuple;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Timeout(value = 5)
 @Testcontainers
 public class TarantoolCrudClientWithRetryTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-27/src/test/java/io/tarantool/spring/data27/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data27.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data27.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-31/src/test/java/io/tarantool/spring/data31/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data31.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data31.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-32/src/test/java/io/tarantool/spring/data32/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data32.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data32.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-33/src/test/java/io/tarantool/spring/data33/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data33.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data33.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-34/src/test/java/io/tarantool/spring/data34/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data34.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data34.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java b/tarantool-spring-data/tarantool-spring-data-35/src/test/java/io/tarantool/spring/data35/integration/BaseIntegrationTest.java
@@ -11,6 +11,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
@@ -24,6 +25,7 @@
 import static io.tarantool.spring.data35.utils.TarantoolTestSupport.writeTestPropertiesYaml;
 import io.tarantool.spring.data35.config.properties.TarantoolProperties;
 
+@Disabled("Refactor TarantoolCartridgeContainer and VshardClusterContainer")
 @Testcontainers
 @Timeout(60)
 public abstract class BaseIntegrationTest {
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java
@@ -23,6 +23,7 @@
 import org.testcontainers.containers.utils.TarantoolContainerClientHelper;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 
+@Deprecated
 public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartridgeContainer>
     implements TarantoolContainerOperations<TarantoolCartridgeContainer> {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/TarantoolContainerOperations.java b/testcontainers/src/main/java/org/testcontainers/containers/TarantoolContainerOperations.java
@@ -5,6 +5,7 @@
 
 package org.testcontainers.containers;
 
+@Deprecated
 public interface TarantoolContainerOperations<T extends Container<T>> extends Container<T> {
   /**
    * Get the Tarantool server exposed port for connecting the client to
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java b/testcontainers/src/main/java/org/testcontainers/containers/VshardClusterContainer.java
@@ -26,6 +26,7 @@
 /**
  * @author Artyom Dubinin
  */
+@Deprecated
 public class VshardClusterContainer extends GenericContainer<VshardClusterContainer>
     implements TarantoolContainerOperations<VshardClusterContainer> {
 
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/Tarantool3Container.java
@@ -8,6 +8,7 @@
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -21,10 +22,8 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.ContainerLaunchException;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.SelinuxContext;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.utils.HttpHost;
 import org.testcontainers.containers.utils.Utils;
@@ -36,6 +35,8 @@ public class Tarantool3Container extends GenericContainer<Tarantool3Container>
 
   private static final Logger LOGGER = LoggerFactory.getLogger(Tarantool3Container.class);
 
+  private static final Path CONTAINER_DATA_DIR = Paths.get("/", "tmp", "tarantool-data");
+
   private final UUID instanceUuid;
 
   private final String node;
@@ -155,18 +156,11 @@ protected void configure() {
       if (this.configured) {
         return;
       }
-      this.mountDataDirectory = Utils.createTempDirectory(this.node);
-      final String mountPathString = this.mountDataDirectory.toAbsolutePath().toString();
-
-      addFileSystemBind(
-          mountPathString,
-          TarantoolContainer.DEFAULT_DATA_DIR.toAbsolutePath().toString(),
-          BindMode.READ_WRITE,
-          SelinuxContext.SHARED);
+      final Path dataDir = CONTAINER_DATA_DIR;
+      final String dataDirStr = dataDir.toAbsolutePath().toString();
 
       if (this.configPath != null && Files.isRegularFile(this.configPath)) {
-        final Path configPathInContainer =
-            TarantoolContainer.DEFAULT_DATA_DIR.resolve(this.configPath.getFileName());
+        final Path configPathInContainer = dataDir.resolve(this.configPath.getFileName());
 
         LOGGER.info(
             "Copy tarantool configuration file from '{}' into '{}'",
@@ -187,8 +181,7 @@ protected void configure() {
       } else if (this.migrationsPath == null) {
         LOGGER.warn("Migrations path doesn't passed or 'null'. Skipped...");
       } else {
-        final Path migrationsPathInContainer =
-            TarantoolContainer.DEFAULT_DATA_DIR.resolve(this.migrationsPath.getFileName());
+        final Path migrationsPathInContainer = dataDir.resolve(this.migrationsPath.getFileName());
         LOGGER.info(
             "Copy tarantool migrations directory from '{}' into '{}'",
             this.migrationsPath,
@@ -204,22 +197,18 @@ protected void configure() {
       withLogConsumer(new Slf4jLogConsumer(LOGGER).withPrefix(this.node));
       withEnv("TT_INSTANCE_NAME", this.node);
       withEnv("TT_DATABASE_INSTANCE_UUID", this.instanceUuid.toString());
-      final String DATA_DIR_STR = TarantoolContainer.DEFAULT_DATA_DIR.toAbsolutePath().toString();
-      withEnv("TT_WAL_DIR", DATA_DIR_STR);
-      withEnv("TT_VINYL_DIR", DATA_DIR_STR);
-      withEnv("TT_SNAPSHOT_DIR", DATA_DIR_STR);
-      withEnv("TT_MEMTX_DIR", DATA_DIR_STR);
+      withEnv("TT_WAL_DIR", dataDirStr);
+      withEnv("TT_VINYL_DIR", dataDirStr);
+      withEnv("TT_SNAPSHOT_DIR", dataDirStr);
+      withEnv("TT_MEMTX_DIR", dataDirStr);
 
       if (this.etcdAddresses.isEmpty()) {
         LOGGER.warn(
             "Tarantool will use the configuration from the local file system because no etcd"
                 + " cluster addresses were passed");
         withEnv(
             "TT_CONFIG",
-            TarantoolContainer.DEFAULT_DATA_DIR
-                .resolve(this.configPath.getFileName())
-                .toAbsolutePath()
-                .toString());
+            dataDir.resolve(this.configPath.getFileName()).toAbsolutePath().toString());
       } else {
         LOGGER.warn(
             "Tarantool will use the configuration from the etcd cluster. Endpoints : {}",
@@ -261,7 +250,9 @@ public void stop() {
 
     try {
       this.lock.lock();
-      Utils.deleteDataDirectory(this.mountDataDirectory);
+      if (this.mountDataDirectory != null) {
+        Utils.deleteDataDirectory(this.mountDataDirectory);
+      }
       super.stop();
       this.isClosed.set(true);
     } finally {
diff --git a/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java b/testcontainers/src/main/java/org/testcontainers/containers/utils/TarantoolContainerClientHelper.java
@@ -221,7 +221,8 @@ public static TarantoolContainer<?> createTarantoolContainer(Integer... exposedP
                   .withNetwork(NETWORK)
                   .waitingFor(
                       new Tarantool3WaitStrategy("localhost", API_USER, CREDS.get(API_USER)))
-                  .withPrivilegedMode(true);
+                  .withPrivilegedMode(true)
+                  .withCreateContainerCmdModifier(cmd -> cmd.withUser("root"));
           default ->
               throw new RuntimeException(
                   String.format("Unsupported Tarantool version, %s", TARANTOOL_VERSION));
