Fix flaky tests (#161)

* Fix flaky tests

* Fix tests for retrying client

* Remove replicas for tests

Author: wey1and

pom.xml

@@ -222,13 +222,13 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.15.3</version>
+            <version>1.16.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.tarantool</groupId>
             <artifactId>testcontainers-java-tarantool</artifactId>
-            <version>0.4.5</version>
+            <version>0.4.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientIT.java

@@ -30,6 +30,7 @@
 import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
 import io.tarantool.driver.api.tuple.operations.TupleOperations;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -74,10 +75,15 @@ public static void setUp() throws Exception {
         truncateSpace(TEST_SPACE_NAME);
     }
 
+    @BeforeEach
+    public void truncateSpace() {
+        truncateSpace("test_space");
+        truncateSpace("test_space_to_join");
+        truncateSpace("second_test_space");
+    }
+
     private static void truncateSpace(String spaceName) {
-        TarantoolSpaceOperations<TarantoolTuple, TarantoolResult<TarantoolTuple>> testSpace =
-                client.space(spaceName);
-        testSpace.truncate().join();
+        client.space(spaceName).truncate().join();
     }
 
     private static TarantoolClusterAddressProvider getClusterAddressProvider() {
@@ -312,9 +318,6 @@ public void clusterUpsertTest() throws ExecutionException, InterruptedException
 
     @Test
     public void functionAggregateResultViaCallTest() throws ExecutionException, InterruptedException {
-        truncateSpace("test_space");
-        truncateSpace("test_space_to_join");
-
         List<Object> values = Arrays.asList(123000, null, "Jane Doe", 999);
         TarantoolTuple tarantoolTuple = tupleFactory.create(values);
         client.space("test_space").insert(tarantoolTuple).get();
@@ -395,8 +398,6 @@ public void singleResultWithConverterTest() throws Exception {
 
     @Test
     public void multiResultWithConverterTest() throws Exception {
-        truncateSpace("second_test_space");
-
         TarantoolSpaceMetadata metadata = client.space("second_test_space").getMetadata();
         MessagePackMapper mapper = client.getConfig().getMessagePackMapper();
 

src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientMixedInstancesIT.java

@@ -1,32 +1,36 @@
 package io.tarantool.driver.integration;
 
-import io.tarantool.driver.core.ClusterTarantoolTupleClient;
-import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
-import io.tarantool.driver.core.ProxyTarantoolTupleClient;
+import io.tarantool.driver.api.SingleValueCallResult;
+import io.tarantool.driver.api.TarantoolClient;
 import io.tarantool.driver.api.TarantoolClientConfig;
 import io.tarantool.driver.api.TarantoolClusterAddressProvider;
-import io.tarantool.driver.api.TarantoolServerAddress;
-import io.tarantool.driver.api.SingleValueCallResult;
 import io.tarantool.driver.api.TarantoolResult;
-import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
+import io.tarantool.driver.api.TarantoolServerAddress;
 import io.tarantool.driver.api.conditions.Conditions;
+import io.tarantool.driver.api.metadata.TarantoolIndexMetadata;
+import io.tarantool.driver.api.metadata.TarantoolIndexType;
+import io.tarantool.driver.api.metadata.TarantoolMetadataOperations;
+import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
+import io.tarantool.driver.api.retry.TarantoolRequestRetryPolicies;
 import io.tarantool.driver.api.space.TarantoolSpaceOperations;
+import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
+import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
 import io.tarantool.driver.api.tuple.operations.TupleOperations;
 import io.tarantool.driver.auth.SimpleTarantoolCredentials;
 import io.tarantool.driver.auth.TarantoolCredentials;
 import io.tarantool.driver.cluster.BinaryClusterDiscoveryEndpoint;
 import io.tarantool.driver.cluster.BinaryDiscoveryClusterAddressProvider;
 import io.tarantool.driver.cluster.TarantoolClusterDiscoveryConfig;
 import io.tarantool.driver.cluster.TestWrappedClusterAddressProvider;
+import io.tarantool.driver.core.ClusterTarantoolTupleClient;
+import io.tarantool.driver.core.ProxyTarantoolTupleClient;
+import io.tarantool.driver.core.RetryingTarantoolTupleClient;
 import io.tarantool.driver.mappers.CallResultMapper;
 import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory;
 import io.tarantool.driver.mappers.MessagePackValueMapper;
-import io.tarantool.driver.api.metadata.TarantoolIndexMetadata;
-import io.tarantool.driver.api.metadata.TarantoolIndexType;
-import io.tarantool.driver.api.metadata.TarantoolMetadataOperations;
-import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -37,6 +41,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -48,7 +53,7 @@
  */
 public class ProxyTarantoolClientMixedInstancesIT extends SharedCartridgeContainerMixedInstances {
 
-    private static ProxyTarantoolTupleClient client;
+    private static TarantoolClient<TarantoolTuple, TarantoolResult<TarantoolTuple>> client;
     private static final DefaultMessagePackMapperFactory mapperFactory = DefaultMessagePackMapperFactory.getInstance();
     private static final TarantoolTupleFactory tupleFactory =
             new DefaultTarantoolTupleFactory(mapperFactory.defaultComplexTypesMapper());
@@ -65,11 +70,11 @@ public static void setUp() throws Exception {
         USER_NAME = container.getUsername();
         PASSWORD = container.getPassword();
         initClient();
-        truncateSpace(TEST_SPACE_NAME);
     }
 
-    private static void truncateSpace(String spaceName) {
-        client.space(spaceName).truncate().join();
+    @BeforeEach
+    public void truncateSpace() {
+        client.space(TEST_SPACE_NAME).truncate().join();
     }
 
     private static TarantoolClusterAddressProvider getClusterAddressProvider() {
@@ -109,7 +114,19 @@ public static void initClient() {
 
         ClusterTarantoolTupleClient clusterClient = new ClusterTarantoolTupleClient(
                 config, getClusterAddressProvider());
-        client = new ProxyTarantoolTupleClient(clusterClient);
+        final ProxyTarantoolTupleClient proxyClient = new ProxyTarantoolTupleClient(clusterClient);
+
+        //todo: remove this hack for crud after solving https://github.com/tarantool/cartridge-java/issues/159
+        final TarantoolRequestRetryPolicies.AttemptsBoundRetryPolicyFactory<Function<Throwable, Boolean>> retryFactory =
+                TarantoolRequestRetryPolicies
+                        .AttemptsBoundRetryPolicyFactory.builder(10,
+                        throwable -> throwable.getMessage().contains("Procedure 'crud")
+                                && throwable.getMessage().contains("is not defined"))
+                        .withDelay(500)
+                        .withRequestTimeout(2000)
+                        .build();
+
+        client = new RetryingTarantoolTupleClient(proxyClient, retryFactory);
     }
 
     @Test

src/test/java/io/tarantool/driver/integration/ProxyTruncateIT.java

@@ -1,26 +1,27 @@
 package io.tarantool.driver.integration;
 
-import io.tarantool.driver.core.ClusterTarantoolTupleClient;
-import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
-import io.tarantool.driver.core.ProxyTarantoolTupleClient;
 import io.tarantool.driver.api.TarantoolClientConfig;
 import io.tarantool.driver.api.TarantoolClusterAddressProvider;
-import io.tarantool.driver.api.TarantoolServerAddress;
-import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
 import io.tarantool.driver.api.TarantoolResult;
+import io.tarantool.driver.api.TarantoolServerAddress;
 import io.tarantool.driver.api.conditions.Conditions;
 import io.tarantool.driver.api.space.TarantoolSpaceOperations;
+import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
+import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
 import io.tarantool.driver.auth.SimpleTarantoolCredentials;
 import io.tarantool.driver.auth.TarantoolCredentials;
 import io.tarantool.driver.cluster.BinaryClusterDiscoveryEndpoint;
 import io.tarantool.driver.cluster.BinaryDiscoveryClusterAddressProvider;
 import io.tarantool.driver.cluster.TarantoolClusterDiscoveryConfig;
 import io.tarantool.driver.cluster.TestWrappedClusterAddressProvider;
-
+import io.tarantool.driver.core.ClusterTarantoolTupleClient;
+import io.tarantool.driver.core.ProxyTarantoolTupleClient;
 import io.tarantool.driver.mappers.DefaultMessagePackMapperFactory;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import java.util.Collections;
 
 import static io.tarantool.driver.integration.Utils.checkSpaceIsEmpty;
@@ -49,7 +50,11 @@ public static void setUp() throws Exception {
         USER_NAME = container.getUsername();
         PASSWORD = container.getPassword();
         initClient();
-        truncateSpace(TEST_SPACE_NAME);
+    }
+
+    @BeforeEach
+    public void truncateSpace() {
+        client.space(TEST_SPACE_NAME).truncate().join();
     }
 
     private static TarantoolClusterAddressProvider getClusterAddressProvider() {
@@ -130,8 +135,4 @@ public void test_truncateEmptySpace_shouldNotThrowExceptionsAndSpaceShouldBeEmpt
         assertDoesNotThrow(() -> testSpace.truncate().join());
         checkSpaceIsEmpty(testSpace);
     }
-
-    private static void truncateSpace(String spaceName) {
-        client.space(spaceName).truncate().join();
-    }
 }

src/test/java/io/tarantool/driver/integration/RetryingTarantoolTupleClientIT.java

@@ -179,7 +179,7 @@ void testInfiniteRetryTimeoutReached_withTarantoolException() throws Exception {
                 TarantoolRequestRetryPolicies
                         .unbound(t -> true)
                         .withRequestTimeout(20) //requestTimeout
-                        .withOperationTimeout(200)  //operationTimeout
+                        .withOperationTimeout(500)  //operationTimeout
                         .build());
 
         CompletableFuture<List<?>> f = retryingClient
@@ -207,7 +207,7 @@ void testInfiniteRetryTimeoutReached_withTimeout() throws Exception {
                 TarantoolRequestRetryPolicies
                         .unbound()
                         .withRequestTimeout(20) //requestTimeout
-                        .withOperationTimeout(200)  //operationTimeout
+                        .withOperationTimeout(500)  //operationTimeout
                         .build());
 
         client.call("reset_request_counters");

src/test/java/io/tarantool/driver/integration/SharedCartridgeContainer.java

@@ -4,6 +4,10 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.wait.strategy.WaitStrategy;
+
+import java.time.Duration;
 
 abstract class SharedCartridgeContainer {
 
@@ -14,7 +18,9 @@ abstract class SharedCartridgeContainer {
                     "cartridge/instances.yml",
                     "cartridge/topology.lua")
                     .withDirectoryBinding("cartridge")
-                    .withLogConsumer(new Slf4jLogConsumer(logger));
+                    .withLogConsumer(new Slf4jLogConsumer(logger))
+                    .waitingFor(Wait.forLogMessage(".*Listening HTTP on.*", 4))
+                    .withStartupTimeout(Duration.ofMinutes(2));
 
     protected static void startCluster() {
         if (!container.isRunning()) {

src/test/java/io/tarantool/driver/integration/SharedCartridgeContainerMixedInstances.java

@@ -4,6 +4,9 @@
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.TarantoolCartridgeContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+
+import java.time.Duration;
 
 abstract class SharedCartridgeContainerMixedInstances {
 
@@ -14,7 +17,9 @@ abstract class SharedCartridgeContainerMixedInstances {
                     "cartridge/instances.yml",
                     "cartridge/topology_mixed.lua")
                     .withDirectoryBinding("cartridge")
-                    .withLogConsumer(new Slf4jLogConsumer(logger));
+                    .withLogConsumer(new Slf4jLogConsumer(logger))
+                    .waitingFor(Wait.forLogMessage(".*Listening HTTP on.*", 4))
+                    .withStartupTimeout(Duration.ofMinutes(2));
 
     protected static void startCluster() {
         if (!container.isRunning()) {

src/test/resources/cartridge/instances.yml

@@ -18,21 +18,6 @@ testapp.s1-master:
   advertise_uri: localhost:3302
   http_port: 8082
 
-testapp.s1-replica:
-  workdir: ./tmp/db_dev/3303
-  advertise_uri: localhost:3303
-  http_port: 8083
-
-testapp.s2-master:
-  workdir: ./tmp/db_dev/3304
-  advertise_uri: localhost:3304
-  http_port: 8084
-
-testapp.s2-replica:
-  workdir: ./tmp/db_dev/3305
-  advertise_uri: localhost:3305
-  http_port: 8085
-
 testapp-stateboard:
   workdir: ./tmp/db_dev/3310
   listen: localhost:3310

src/test/resources/cartridge/replicasets.yml

@@ -19,18 +19,6 @@ app-router-second:
 s1-storage:
   instances:
   - s1-master
-  - s1-replica
-  roles:
-  - vshard-storage
-  - crud-storage
-  - app.roles.api_storage
-  weight: 1
-  all_rw: false
-  vshard_group: default
-s2-storage:
-  instances:
-  - s2-master
-  - s2-replica
   roles:
   - vshard-storage
   - crud-storage

src/test/resources/cartridge/topology.lua

@@ -14,10 +14,6 @@ replicasets = { {
                 }, {
                     alias = 's1-storage',
                     roles = { 'vshard-storage', 'app.roles.api_storage' },
-                    join_servers = { { uri = 'localhost:3302' }, { uri = 'localhost:3303' } }
-                }, {
-                    alias = 's2-storage',
-                    roles = { 'vshard-storage', 'app.roles.api_storage' },
-                    join_servers = { { uri = 'localhost:3304' }, { uri = 'localhost:3305' } }
+                    join_servers = { { uri = 'localhost:3302' } }
                 } }
 return cartridge.admin_edit_topology({ replicasets = replicasets })