Skip to content

Commit 7ac257a

Browse files
committed
change timeout to 120s or sth.
1 parent ab7b1c1 commit 7ac257a

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private void invalidationTestInner(
271271
// wait for latches and fail if they don't reach zero before timeout
272272
assertThat(
273273
Uninterruptibles.awaitUninterruptibly(
274-
preparedStmtCacheRemoveLatch, 20, TimeUnit.SECONDS))
274+
preparedStmtCacheRemoveLatch, 120, TimeUnit.SECONDS))
275275
.withFailMessage("preparedStmtCacheRemoveLatch did not trigger before timeout")
276276
.isTrue();
277277
assertThat(Uninterruptibles.awaitUninterruptibly(typeChangeEventLatch, 20, TimeUnit.SECONDS))

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/reactive/DefaultReactiveResultSetIT.java

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@
3131
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
3232
import com.datastax.oss.driver.api.core.cql.PreparedStatement;
3333
import com.datastax.oss.driver.api.core.cql.SimpleStatement;
34+
import com.datastax.oss.driver.api.core.cql.Statement;
3435
import com.datastax.oss.driver.api.testinfra.ccm.CcmRule;
3536
import com.datastax.oss.driver.api.testinfra.ccm.SchemaChangeSynchronizer;
3637
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
37-
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
3838
import com.datastax.oss.driver.categories.ParallelizableTests;
3939
import com.datastax.oss.driver.internal.core.cql.EmptyColumnDefinitions;
4040
import com.tngtech.java.junit.dataprovider.DataProvider;
4141
import com.tngtech.java.junit.dataprovider.DataProviderRunner;
4242
import edu.umd.cs.findbugs.annotations.NonNull;
4343
import io.reactivex.Flowable;
44-
import java.time.Duration;
4544
import java.util.LinkedHashSet;
4645
import java.util.List;
4746
import java.util.Set;
@@ -60,14 +59,7 @@ public class DefaultReactiveResultSetIT {
6059

6160
private static CcmRule ccmRule = CcmRule.getInstance();
6261

63-
private static SessionRule<CqlSession> sessionRule =
64-
SessionRule.builder(ccmRule)
65-
.withConfigLoader(
66-
SessionUtils.configLoaderBuilder()
67-
.withDuration(
68-
DefaultDriverOption.METADATA_SCHEMA_REQUEST_TIMEOUT, Duration.ofSeconds(20))
69-
.build())
70-
.build();
62+
private static SessionRule<CqlSession> sessionRule = SessionRule.builder(ccmRule).build();
7163

7264
@ClassRule public static TestRule chain = RuleChain.outerRule(ccmRule).around(sessionRule);
7365

@@ -76,19 +68,15 @@ public static void initialize() {
7668
CqlSession session = sessionRule.session();
7769
SchemaChangeSynchronizer.withLock(
7870
() -> {
79-
session.execute("DROP TABLE IF EXISTS test_reactive_read");
80-
session.execute("DROP TABLE IF EXISTS test_reactive_write");
71+
session.execute(createSlowStatement("DROP TABLE IF EXISTS test_reactive_read"));
72+
session.execute(createSlowStatement("DROP TABLE IF EXISTS test_reactive_write"));
8173
session.checkSchemaAgreement();
8274
session.execute(
83-
SimpleStatement.builder(
84-
"CREATE TABLE test_reactive_read (pk int, cc int, v int, PRIMARY KEY ((pk), cc))")
85-
.setExecutionProfile(sessionRule.slowProfile())
86-
.build());
75+
createSlowStatement(
76+
"CREATE TABLE test_reactive_read (pk int, cc int, v int, PRIMARY KEY ((pk), cc))"));
8777
session.execute(
88-
SimpleStatement.builder(
89-
"CREATE TABLE test_reactive_write (pk int, cc int, v int, PRIMARY KEY ((pk), cc))")
90-
.setExecutionProfile(sessionRule.slowProfile())
91-
.build());
78+
createSlowStatement(
79+
"CREATE TABLE test_reactive_write (pk int, cc int, v int, PRIMARY KEY ((pk), cc))"));
9280
session.checkSchemaAgreement();
9381
});
9482
for (int i = 0; i < 1000; i++) {
@@ -101,6 +89,12 @@ public static void initialize() {
10189
}
10290
}
10391

92+
static Statement<?> createSlowStatement(String statement) {
93+
return SimpleStatement.builder(statement)
94+
.setExecutionProfile(sessionRule.slowProfile())
95+
.build();
96+
}
97+
10498
@Before
10599
public void truncateTables() throws Exception {
106100
CqlSession session = sessionRule.session();

integration-tests/src/test/java/com/datastax/oss/driver/core/metrics/MetricsITBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void should_evict_down_node_metrics_when_timeout_fires() throws Exception
179179
// then node-level metrics should be evicted from node1, but
180180
// node2 and node3 metrics should not have been evicted
181181
await()
182-
.atMost(Duration.ofSeconds(40))
182+
.atMost(Duration.ofSeconds(120))
183183
.untilAsserted(() -> assertNodeMetricsEvicted(session, node1));
184184
assertNodeMetricsNotEvicted(session, node2);
185185
assertNodeMetricsNotEvicted(session, node3);

integration-tests/src/test/java/com/datastax/oss/driver/internal/core/type/codec/UdtCodecIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public void should_decoding_udt_be_backward_compatible() {
5151
CqlSession session = sessionRule.session();
5252
session.execute(
5353
SimpleStatement.newInstance("CREATE TYPE test_type_1 (a text, b int)")
54-
.setTimeout(Duration.ofSeconds(20)));
54+
.setTimeout(Duration.ofSeconds(120)));
5555
session.execute(
5656
SimpleStatement.newInstance(
5757
"CREATE TABLE test_table_1 (e int primary key, f frozen<test_type_1>)")
58-
.setTimeout(Duration.ofSeconds(20)));
58+
.setTimeout(Duration.ofSeconds(120)));
5959
// insert a row using version 1 of the UDT schema
6060
session.execute("INSERT INTO test_table_1(e, f) VALUES(1, {a: 'a', b: 1})");
6161
UserDefinedType udt =

0 commit comments

Comments
 (0)