Fix dependencies between tests

tarantool · Apr 27, 2023 · 4ea0205 · 4ea0205
1 parent 87468f9
commit 4ea0205
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/src/test/java/io/tarantool/driver/integration/CartridgeMixedInstancesContainer.java b/src/test/java/io/tarantool/driver/integration/CartridgeMixedInstancesContainer.java
@@ -1,30 +1,30 @@
 package io.tarantool.driver.integration;
 
+import java.time.Duration;
+import java.util.HashMap;
+
 import org.slf4j.Logger;
 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;
-import java.util.HashMap;
-
 abstract class CartridgeMixedInstancesContainer {
 
     private static final Logger logger = LoggerFactory.getLogger(CartridgeMixedInstancesContainer.class);
 
     protected static final TarantoolCartridgeContainer container;
 
     static {
-        final HashMap<String, String> buildArgs = new HashMap<>();
-        buildArgs.put("TARANTOOL_INSTANCES_FILE", "./instances_mixed.yml");
-        container = new TarantoolCartridgeContainer(
-            "cartridge/instances_mixed.yml",
-            "cartridge/topology_mixed.lua", buildArgs)
-            .withDirectoryBinding("cartridge")
-            .withLogConsumer(new Slf4jLogConsumer(logger))
-            .waitingFor(Wait.forLogMessage(".*Listening HTTP on.*", 3))
-            .withStartupTimeout(Duration.ofMinutes(2));
+        final HashMap<String, String> env = new HashMap<>();
+        env.put("TARANTOOL_INSTANCES_FILE", "./instances_mixed.yml");
+        container = new TarantoolCartridgeContainer("cartridge/instances_mixed.yml",
+                                                    "cartridge/topology_mixed.lua")
+                        .withDirectoryBinding("cartridge")
+                        .withLogConsumer(new Slf4jLogConsumer(logger))
+                        .waitingFor(Wait.forLogMessage(".*Listening HTTP on.*", 3))
+                        .withStartupTimeout(Duration.ofMinutes(2))
+                        .withEnv(env);
     }
 
     protected static void startCluster() {

diff --git a/src/test/java/io/tarantool/driver/integration/ClusterConnectionIT.java b/src/test/java/io/tarantool/driver/integration/ClusterConnectionIT.java
@@ -142,9 +142,7 @@ void test_roundRobin_shouldWorkCorrectly_withDiscoveryAndConnections()
         Object routerCallCounterPerConnection = getCallCountersPerConnection(getAllConnectionCalls, routerClient4);
         assertEquals(Arrays.asList(2, 2), routerCallCounterPerConnection);
 
-        String pid = container.execInContainer("pgrep", "-f", "testapp@fourth-router")
-                         .getStdout().replace("\n", "");
-        container.execInContainer("kill", "-9", pid);
+        stopInstance("fourth-router");
         // wait until discovery get topology
         Thread.sleep(5_000);
 
@@ -156,11 +154,11 @@ void test_roundRobin_shouldWorkCorrectly_withDiscoveryAndConnections()
         }
         Thread.sleep(5_000);
         for (TarantoolClient router :
-            Arrays.asList(routerClient1, routerClient3)) {
+            Arrays.asList(routerClient1, routerClient2, routerClient3)) {
             assertEquals(Arrays.asList(6, 7), getCallCountersPerConnection(getAllConnectionCalls, router));
         }
-        routerCallCounterPerConnection = getCallCountersPerConnection(getAllConnectionCalls, routerClient4);
-        assertEquals(Arrays.asList(4, 4), routerCallCounterPerConnection);
+
+        startCartridge();
     }
 
     private static TarantoolClient<TarantoolTuple, TarantoolResult<TarantoolTuple>> getSimpleClient(Integer port) {

diff --git a/src/test/java/io/tarantool/driver/integration/ClusterDiscoveryIT.java b/src/test/java/io/tarantool/driver/integration/ClusterDiscoveryIT.java
@@ -44,7 +44,7 @@ public void httpClusterDiscovererTest() throws TarantoolClientException {
         HTTPDiscoveryClusterAddressProvider addressProvider = getHttpProvider();
         Collection<TarantoolServerAddress> nodes = addressProvider.getAddresses();
 
-        assertEquals(nodes.size(), 3);
+        assertEquals(nodes.size(), 4);
         Set<TarantoolServerAddress> nodeSet = new HashSet<>(nodes);
         assertTrue(nodeSet.contains(new TarantoolServerAddress(TEST_ROUTER1_URI)));
         assertTrue(nodeSet.contains(new TarantoolServerAddress(TEST_ROUTER2_URI)));
@@ -70,7 +70,7 @@ public void binaryClusterDiscovererTest() {
         TarantoolClusterAddressProvider addressProvider = getBinaryProvider();
 
         Collection<TarantoolServerAddress> nodes = addressProvider.getAddresses();
-        assertEquals(nodes.size(), 3);
+        assertEquals(nodes.size(), 4);
         Set<TarantoolServerAddress> nodeSet = new HashSet<>(nodes);
         assertTrue(nodeSet.contains(new TarantoolServerAddress(TEST_ROUTER1_URI)));
         assertTrue(nodeSet.contains(new TarantoolServerAddress(TEST_ROUTER2_URI)));

diff --git a/src/test/java/io/tarantool/driver/integration/ReconnectIT.java b/src/test/java/io/tarantool/driver/integration/ReconnectIT.java
@@ -25,6 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -245,6 +246,8 @@ void test_should_closeConnections_ifAddressProviderReturnsNewAddresses() throws
         // restart routers for resetting connections
         stopInstances(Arrays.asList("router", "second-router"));
         startCartridge();
+        String status = container.execInContainer("cartridge", "status", "--run-dir=/tmp/run").getStderr();
+        assertEquals(6, StringUtils.countMatches(status, "RUNNING"));
 
         final TarantoolServerAddress firstAddress =
             new TarantoolServerAddress(container.getRouterHost(), container.getMappedPort(3301));
@@ -298,7 +301,7 @@ public void setRefreshCallback(Runnable runnable) {
                                 numberOfSwitching.incrementAndGet();
                                 runnable.run();
                             }
-                        }, 500, 100, TimeUnit.MILLISECONDS);
+                        }, 0, 100, TimeUnit.MILLISECONDS);
                     }
                 }).build();
 

diff --git a/src/test/java/io/tarantool/driver/integration/SharedCartridgeContainer.java b/src/test/java/io/tarantool/driver/integration/SharedCartridgeContainer.java
@@ -55,6 +55,6 @@ protected static void startInstance(String instanceName) throws IOException, Int
     }
 
     protected static void stopInstance(String instanceName) throws IOException, InterruptedException {
-        container.execInContainer("cartridge", "stop", "--run-dir=/tmp/run", "--data-dir=/tmp/data", instanceName);
+        container.execInContainer("cartridge", "stop", "--run-dir=/tmp/run", instanceName);
     }
 }