Skip to content

Commit df4dc8f

Browse files
Alex-pvlAlex-pvl
committed
test: update tt3 version
1 parent 56531ae commit df4dc8f

27 files changed

Lines changed: 427 additions & 121 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
strategy:
6969
fail-fast: false
7070
matrix:
71-
tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
71+
tarantool-version: [ "2.11.8-ubuntu20.04", "3.5.0" ]
7272
timeout-minutes: 40
7373
steps:
7474
- uses: actions/checkout@v6
@@ -127,7 +127,7 @@ jobs:
127127
strategy:
128128
fail-fast: false
129129
matrix:
130-
tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
130+
tarantool-version: [ "2.11.8-ubuntu20.04", "3.5.0" ]
131131
timeout-minutes: 40
132132
steps:
133133
- uses: actions/checkout@v6

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/BaseTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717
import io.netty.util.Timer;
1818
import org.msgpack.value.ArrayValue;
1919
import org.msgpack.value.ValueFactory;
20-
import org.testcontainers.containers.tarantool.TarantoolContainer;
2120

2221
import io.tarantool.core.ManagedResource;
2322
import io.tarantool.core.connection.ConnectionFactory;
2423
import io.tarantool.pool.HeartbeatOpts;
2524

2625
public abstract class BaseTest {
2726

28-
protected static TarantoolContainer<?> container;
29-
3027
protected static final Bootstrap bootstrap =
3128
new Bootstrap()
3229
.group(new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory()))
@@ -69,6 +66,10 @@ public abstract class BaseTest {
6966
protected static final int INVALID_PINGS = 2;
7067
protected static final long INVALIDATION_TIMEOUT =
7168
((long) (INVALID_PINGS + 1) * (PING_INTERVAL + TIMER_ERROR_MS));
69+
70+
/** Longer wait for invalidation (e.g. Tarantool 3 with more connections). */
71+
protected static final long EXTENDED_INVALIDATION_TIMEOUT = INVALIDATION_TIMEOUT * 3;
72+
7273
protected static final long RESTORE_TIMEOUT =
7374
(WINDOW_SIZE + 1) * (PING_INTERVAL + TIMER_ERROR_MS);
7475
protected static final ArrayValue emptyArgs = ValueFactory.emptyArray();

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/DistributingRoundRobinBalancerTest.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertThrows;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
1818
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
19+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
1920
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
2021
import io.micrometer.core.instrument.MeterRegistry;
2122
import io.netty.util.HashedWheelTimer;
@@ -40,7 +41,7 @@
4041
import io.tarantool.pool.IProtoClientPoolImpl;
4142
import io.tarantool.pool.InstanceConnectionGroup;
4243

43-
@Timeout(value = 15)
44+
@Timeout(value = 25)
4445
public class DistributingRoundRobinBalancerTest extends BaseTest {
4546

4647
private static final Logger log =
@@ -51,11 +52,14 @@ public class DistributingRoundRobinBalancerTest extends BaseTest {
5152

5253
@BeforeEach
5354
public void setUp() {
54-
tt1 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3301, 3305);
55-
tt2 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3301, 3305);
55+
tt1 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3305);
56+
tt2 = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3305);
5657

5758
tt1.start();
5859
tt2.start();
60+
61+
execInitScript(tt1);
62+
execInitScript(tt2);
5963
do {
6064
count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
6165
count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
@@ -178,8 +182,10 @@ public void testDistributingRoundRobinWithUnavailableNodeA() throws Exception {
178182
execLua(tt2, "reset_call_counter()");
179183

180184
log.info("waiting for invalidation");
181-
Thread.sleep(INVALIDATION_TIMEOUT);
185+
Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
182186

187+
execLua(tt1, "reset_call_counter()");
188+
execLua(tt2, "reset_call_counter()");
183189
log.info("walk on node B only");
184190
walkAndJoin(rrBalancer, nodeVisits * 2);
185191
assertEquals(0, getCallCounter(tt1));
@@ -235,8 +241,10 @@ public void testDistributingRoundRobinWithUnavailableNodeANoUnlock() throws Exce
235241
execLua(tt2, "reset_call_counter()");
236242

237243
log.info("waiting for invalidation");
238-
Thread.sleep(INVALIDATION_TIMEOUT);
244+
Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
239245

246+
execLua(tt1, "reset_call_counter()");
247+
execLua(tt2, "reset_call_counter()");
240248
log.info("walk on node B only");
241249
walkAndJoin(rrBalancer, nodeVisits * 2);
242250
assertEquals(0, getCallCounter(tt1));
@@ -290,7 +298,7 @@ public void testDistributingRoundRobinNoAvailableClients() throws Exception {
290298
execLua(tt2, "lock_pipe(true); reset_call_counter()");
291299

292300
log.info("waiting for invalidation");
293-
Thread.sleep(INVALIDATION_TIMEOUT);
301+
Thread.sleep(EXTENDED_INVALIDATION_TIMEOUT);
294302

295303
Throwable exc = assertThrows(ExecutionException.class, () -> rrBalancer.getNext().get());
296304
assertEquals(NoAvailableClientsException.class, exc.getCause().getClass());

‎tarantool-balancer/src/test/java/io/tarantool/balancer/integration/RoundRobinBalancerTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import static org.junit.jupiter.api.Assertions.assertEquals;
1313
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
14+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
1415
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
1516
import org.junit.jupiter.api.AfterAll;
1617
import org.junit.jupiter.api.BeforeAll;
@@ -40,6 +41,9 @@ public static void setUp() {
4041
tt1.start();
4142
tt2.start();
4243

44+
execInitScript(tt1);
45+
execInitScript(tt2);
46+
4347
count1 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
4448
count2 = ThreadLocalRandom.current().nextInt(MIN_CONNECTION_COUNT, MAX_CONNECTION_COUNT + 1);
4549
}

‎tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolBoxClientTest.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static org.junit.jupiter.api.Assertions.assertThrows;
3434
import static org.junit.jupiter.api.Assertions.assertTrue;
3535
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
36+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
3637
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommand;
3738
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
3839
import com.fasterxml.jackson.core.type.TypeReference;
@@ -98,6 +99,7 @@ public void truncateSpaces() throws Exception {
9899
public static void setUp() throws Exception {
99100
tt = createTarantoolContainer().withEnv(ENV_MAP);
100101
tt.start();
102+
execInitScript(tt);
101103

102104
client =
103105
TarantoolFactory.box()
@@ -1352,26 +1354,14 @@ void testClientType() {
13521354
assertEquals(ClientType.BOX, client.getType());
13531355
}
13541356

1355-
@Test
1356-
void testUserWithNullPassword() throws Exception {
1357-
TarantoolBoxClient serviceClient =
1358-
TarantoolFactory.box()
1359-
.withHost(tt.getHost())
1360-
.withPort(tt.getFirstMappedPort())
1361-
.withUser("service_user")
1362-
.withPassword("")
1363-
.build();
1364-
assertEquals(Collections.singletonList(123), serviceClient.eval("return 123").join().get());
1365-
}
1366-
13671357
@Test
13681358
void testGetServerVersion() throws Exception {
13691359
TarantoolBoxClient client =
13701360
TarantoolFactory.box()
13711361
.withHost(tt.getHost())
13721362
.withPort(tt.getFirstMappedPort())
1373-
.withUser("service_user")
1374-
.withPassword("")
1363+
.withUser("api_user")
1364+
.withPassword("secret")
13751365
.build();
13761366

13771367
TarantoolVersion version = client.getServerVersion().join();

‎tarantool-client/src/test/java/io/tarantool/client/integration/TarantoolClientTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static org.junit.jupiter.api.Assertions.assertThrows;
2626
import static org.junit.jupiter.api.Assertions.assertTrue;
2727
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
28+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
2829
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommand;
2930
import com.fasterxml.jackson.core.type.TypeReference;
3031
import org.junit.jupiter.api.AfterAll;
@@ -60,6 +61,7 @@ public class TarantoolClientTest extends BaseTest {
6061
public static void setUp() throws Exception {
6162
tt = createTarantoolContainer().withEnv(ENV_MAP);
6263
tt.start();
64+
execInitScript(tt);
6365

6466
client = getClientAndConnect();
6567
client.getPool().forEach(c -> c.authorize(API_USER, CREDS.get(API_USER)).join());
@@ -353,7 +355,7 @@ public void testServerInformation() {
353355
int serverFeatureAmount = 4;
354356

355357
if (tarantoolVersion == '3') {
356-
serverFeatureAmount = 7;
358+
serverFeatureAmount = 10;
357359
}
358360
IProtoClient iprotoClient = client.getPool().get("default", 0).join();
359361
if (tarantoolVersion != '3') {

‎tarantool-core/src/test/java/io/tarantool/core/integration/ConnectionCloseOnClientSideTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static org.junit.jupiter.api.Assertions.assertEquals;
1313
import static org.junit.jupiter.api.Assertions.assertThrows;
1414
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
15+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
1516
import org.junit.jupiter.api.AfterAll;
1617
import org.junit.jupiter.api.BeforeAll;
1718
import org.junit.jupiter.api.Test;
@@ -32,6 +33,7 @@ public class ConnectionCloseOnClientSideTest extends BaseTest {
3233
static void setUp() {
3334
tt = createTarantoolContainer().withEnv(ENV_MAP);
3435
tt.start();
36+
execInitScript(tt);
3537
}
3638

3739
@AfterAll

‎tarantool-core/src/test/java/io/tarantool/core/integration/ConnectionCloseOnServerSideTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.junit.jupiter.api.Assertions.assertThrows;
1717
import static org.junit.jupiter.api.Assertions.assertTrue;
1818
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
19+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
1920
import org.junit.jupiter.api.AfterAll;
2021
import org.junit.jupiter.api.BeforeAll;
2122
import org.junit.jupiter.api.Test;
@@ -36,6 +37,7 @@ public class ConnectionCloseOnServerSideTest extends BaseTest {
3637
static void setUp() {
3738
tt = createTarantoolContainer().withEnv(ENV_MAP);
3839
tt.start();
40+
execInitScript(tt);
3941
}
4042

4143
@AfterAll

‎tarantool-core/src/test/java/io/tarantool/core/integration/ConnectionToTarantoolTest.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
import static org.msgpack.value.ValueFactory.newInteger;
3434
import static org.msgpack.value.ValueFactory.newMap;
3535
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
36+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
3637
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.executeCommandDecoded;
3738
import io.netty.channel.ConnectTimeoutException;
3839
import org.junit.jupiter.api.AfterAll;
3940
import org.junit.jupiter.api.BeforeAll;
4041
import org.junit.jupiter.api.RepeatedTest;
4142
import org.junit.jupiter.api.Test;
4243
import org.junit.jupiter.api.Timeout;
44+
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
4345
import org.msgpack.value.Value;
4446
import org.msgpack.value.ValueFactory;
4547
import org.slf4j.Logger;
@@ -103,9 +105,10 @@ public void accept(IProtoResponse msg) {
103105

104106
@BeforeAll
105107
public static void setUp() throws Exception {
106-
tt = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3302, 3303, 3304, 3306);
108+
tt = createTarantoolContainer(3302, 3303, 3304, 3306).withEnv(ENV_MAP);
107109

108110
tt.start();
111+
execInitScript(tt);
109112

110113
List<?> result = executeCommandDecoded(tt, "return box.info.version");
111114
String fullVersion = (String) result.get(0);
@@ -190,6 +193,7 @@ public void testConnectToAddressWithBadHost() {
190193
* SocketException with "Connection reset" message
191194
* */
192195
@Test
196+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
193197
public void testConnectToNonAcceptingService() {
194198
Integer otherPort = tt.getMappedPort(3302);
195199
Connection client = factory.create();
@@ -222,6 +226,7 @@ public void testConnectToNonAcceptingService() {
222226
}
223227

224228
@Test
229+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
225230
public void testConnectToServiceWithBadGreeting() {
226231
Integer otherPort = tt.getMappedPort(3304);
227232
Connection client = factory.create();
@@ -239,6 +244,7 @@ public void testConnectToServiceWithBadGreeting() {
239244
* ConnectionException with "Connection timeout" message
240245
* */
241246
@Test
247+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
242248
public void testConnectToSilentNode() {
243249
Integer otherPort = tt.getMappedPort(3303);
244250
Connection client = factory.create().listen(msg -> {});
@@ -256,6 +262,7 @@ public void testConnectToSilentNode() {
256262
* ConnectionException with "Connection timeout" message
257263
* */
258264
@Test
265+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
259266
public void testConnectToSilentNodeAndClose() throws Exception {
260267
Integer otherPort = tt.getMappedPort(3303);
261268
Connection client = factory.create().listen(msg -> {});
@@ -322,6 +329,7 @@ public void testConnectByMultipleThreads() throws InterruptedException {
322329
}
323330

324331
@Test
332+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
325333
public void testConnectWithGreetingTimeout() throws InterruptedException {
326334
Connection client = factory.create();
327335
InetSocketAddress address = new InetSocketAddress(tt.getHost(), tt.getMappedPort(3306));
@@ -335,6 +343,7 @@ public void testConnectWithGreetingTimeout() throws InterruptedException {
335343
}
336344

337345
@Test
346+
@DisabledIfEnvironmentVariable(named = "TARANTOOL_VERSION", matches = "3.*")
338347
public void testConnectWithWaitingForGreetingAndClose() throws Exception {
339348
Connection client = factory.create();
340349
InetSocketAddress address = new InetSocketAddress(tt.getHost(), tt.getMappedPort(3306));

‎tarantool-core/src/test/java/io/tarantool/core/integration/GracefulShutdownTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static org.junit.jupiter.api.Assertions.assertEquals;
1515
import static org.junit.jupiter.api.Assertions.assertTrue;
1616
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.createTarantoolContainer;
17+
import static org.testcontainers.containers.utils.TarantoolContainerClientHelper.execInitScript;
1718
import org.junit.jupiter.api.AfterAll;
1819
import org.junit.jupiter.api.BeforeAll;
1920
import org.junit.jupiter.api.Test;
@@ -37,9 +38,10 @@ public class GracefulShutdownTest extends BaseTest {
3738
private static TarantoolContainer<?> tt;
3839

3940
@BeforeAll
40-
public static void setUp() throws Exception {
41-
tt = createTarantoolContainer().withEnv(ENV_MAP).withExposedPorts(3301);
41+
public static void setUp() {
42+
tt = createTarantoolContainer().withEnv(ENV_MAP);
4243
tt.start();
44+
execInitScript(tt);
4345

4446
address = tt.mappedAddress();
4547
}

0 commit comments

Comments
 (0)