Increase await() timeout for 30 seconds in MQTT tests

**Auto-cherry-pick to `6.3.x` & `6.2.x`**
This commit is contained in:
Artem Bilan
2024-11-04 16:20:51 -05:00
parent 3dab443612
commit 846d655084
2 changed files with 5 additions and 3 deletions

View File

@@ -17,6 +17,7 @@
package org.springframework.integration.mqtt;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -124,7 +125,7 @@ class ClientManagerBackToBackTests implements MosquittoContainerTest {
if (ctx.containsBean("deliveryEvents")) {
List<MqttMessageDeliveryEvent> deliveryEvents = ctx.getBean("deliveryEvents", List.class);
// MqttMessageSentEvent and MqttMessageDeliveredEvent
await().untilAsserted(() -> assertThat(deliveryEvents).hasSize(2));
await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> assertThat(deliveryEvents).hasSize(2));
}
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2023 the original author or authors.
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.integration.mqtt;
import java.time.Duration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -82,7 +83,7 @@ public class ResubscribeAfterAutomaticReconnectTests implements MosquittoContain
assertThat(this.config.subscribeSecondLatch.await(10, TimeUnit.SECONDS)).isTrue();
await().untilAsserted(() -> this.mqttOutFlowInput.send(testMessage));
await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> this.mqttOutFlowInput.send(testMessage));
assertThat(this.fromMqttChannel.receive(10_000)).isNotNull();
// Re-subscription on channel adapter restart with cleanStart