Skip to content

Commit fe81fa6

Browse files
committed
Increase timeouts in test
Changes in CI made it much slower and unstable, trying to adapt tests.
1 parent 5522ee0 commit fe81fa6

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

src/test/java/com/rabbitmq/stream/impl/StreamEnvironmentTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void growShrinkResourcesWhenProducersConsumersAreOpenedAndClosed(TestInfo info)
235235
int producersCount = ProducersCoordinator.MAX_PRODUCERS_PER_CLIENT * 3 + 10;
236236
int consumersCount = ConsumersCoordinator.MAX_SUBSCRIPTIONS_PER_CLIENT * 2 + 10;
237237

238-
try (Environment environment = environmentBuilder.build()) {
238+
try (Environment environment = environmentBuilder.rpcTimeout(Duration.ofSeconds(20)).build()) {
239239
List<String> streams =
240240
IntStream.range(0, streamCount)
241241
.mapToObj(i -> streamName(info))
@@ -286,8 +286,8 @@ void growShrinkResourcesWhenProducersConsumersAreOpenedAndClosed(TestInfo info)
286286
});
287287
});
288288

289-
assertThat(confirmLatch.await(10, SECONDS)).isTrue();
290-
assertThat(consumeLatch.await(10, SECONDS)).isTrue();
289+
latchAssert(confirmLatch).completes();
290+
latchAssert(consumeLatch).completes();
291291

292292
EnvironmentInfo environmentInfo = MonitoringTestUtils.extract(environment);
293293
assertThat(environmentInfo.getProducers()).hasSize(1);

src/test/java/com/rabbitmq/stream/impl/TestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ public final class TestUtils {
8989

9090
private static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class);
9191

92-
private static final Duration DEFAULT_CONDITION_TIMEOUT = Duration.ofSeconds(10);
92+
private static final Duration DEFAULT_CONDITION_TIMEOUT = Duration.ofSeconds(20);
9393

9494
private TestUtils() {}
9595

9696
public static Duration waitAtMost(CallableBooleanSupplier condition) throws Exception {
97-
return waitAtMost(10, condition, null);
97+
return waitAtMost(DEFAULT_CONDITION_TIMEOUT, condition, null);
9898
}
9999

100100
public static Duration waitAtMost(CallableBooleanSupplier condition, Supplier<String> message)
@@ -841,7 +841,7 @@ private BrokerVersionAtLeast311Condition() {
841841

842842
static class CountDownLatchAssert implements AssertDelegateTarget {
843843

844-
private static final Duration TIMEOUT = Duration.ofSeconds(10);
844+
private static final Duration TIMEOUT = DEFAULT_CONDITION_TIMEOUT;
845845

846846
private final CountDownLatch latch;
847847

src/test/java/com/rabbitmq/stream/impl/TlsTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static com.rabbitmq.stream.impl.TestUtils.b;
1717
import static com.rabbitmq.stream.impl.TestUtils.latchAssert;
1818
import static com.rabbitmq.stream.impl.Utils.TRUST_EVERYTHING_TRUST_MANAGER;
19-
import static java.time.Duration.ofSeconds;
2019
import static org.assertj.core.api.Assertions.assertThat;
2120
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2221

@@ -149,7 +148,7 @@ static X509Certificate loadCertificate(String file) throws Exception {
149148
}
150149

151150
@Test
152-
void publishAndConsumeWithUnverifiedConnection() throws Exception {
151+
void publishAndConsumeWithUnverifiedConnection() {
153152
int publishCount = 1_000_000;
154153

155154
CountDownLatch consumedLatch = new CountDownLatch(publishCount);
@@ -196,8 +195,8 @@ void publishAndConsumeWithUnverifiedConnection() throws Exception {
196195
})
197196
.start();
198197

199-
latchAssert(confirmedLatch).completes(ofSeconds(20));
200-
latchAssert(consumedLatch).completes(ofSeconds(20));
198+
latchAssert(confirmedLatch).completes();
199+
latchAssert(consumedLatch).completes();
201200
client.unsubscribe(b(1));
202201
}
203202

src/test/java/com/rabbitmq/stream/perf/StreamPerfTestTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void tearDownTest() {
137137

138138
private void waitRunEnds(int expectedExitCode) throws Exception {
139139
waitAtMost(
140-
20,
140+
Duration.ofSeconds(30),
141141
() -> exitCode.get() == expectedExitCode,
142142
() -> "Expected " + expectedExitCode + " exit code, got " + exitCode.get());
143143
}
@@ -544,7 +544,12 @@ private HttpResponse(int responseCode, String body) {
544544

545545
static class ArgumentsBuilder {
546546

547-
private final Map<String, String> arguments = new HashMap<>();
547+
private final Map<String, String> arguments =
548+
new HashMap<String, String>() {
549+
{
550+
put("rpc-timeout", "20");
551+
}
552+
};
548553

549554
ArgumentsBuilder uris(String url) {
550555
arguments.put("uris", url);

0 commit comments

Comments
 (0)