From 88ccab8f13f57b9daeb5f4301b9cfd8eaa46a451 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Sat, 8 Aug 2020 16:39:56 +0200 Subject: [PATCH] Revert timeout inscreases in STOMP tests This change is not fixing tests but rather increasing their duration, so we're reverting this change as a result. --- .../messaging/simp/stomp/ReactorNettyTcpStompClientTests.java | 4 ++-- .../stomp/StompBrokerRelayMessageHandlerIntegrationTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java index 8fa0bcde17..4bf79b57d2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClientTests.java @@ -106,8 +106,8 @@ public class ReactorNettyTcpStompClientTests { ConsumingHandler consumingHandler2 = new ConsumingHandler(destination); ListenableFuture consumerFuture2 = this.client.connect(consumingHandler2); - assertThat(consumingHandler1.awaitForSubscriptions(10000)).isTrue(); - assertThat(consumingHandler2.awaitForSubscriptions(10000)).isTrue(); + assertThat(consumingHandler1.awaitForSubscriptions(5000)).isTrue(); + assertThat(consumingHandler2.awaitForSubscriptions(5000)).isTrue(); ProducingHandler producingHandler = new ProducingHandler(); producingHandler.addToSend(destination, "foo1"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java index 0c2df22dfd..609f12f7be 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java @@ -254,7 +254,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests { } public void expectBrokerAvailabilityEvent(boolean isBrokerAvailable) throws InterruptedException { - BrokerAvailabilityEvent event = this.eventQueue.poll(40000, TimeUnit.MILLISECONDS); + BrokerAvailabilityEvent event = this.eventQueue.poll(20000, TimeUnit.MILLISECONDS); assertThat(event).as("Times out waiting for BrokerAvailabilityEvent[" + isBrokerAvailable + "]").isNotNull(); assertThat(event.isBrokerAvailable()).isEqualTo(isBrokerAvailable); }