From f60eb5e217cd98c84cc43bd97d5957d1a802e623 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 18 May 2012 09:23:32 -0400 Subject: [PATCH] AMQP-232 Fix Failing Integration Tests Increase timers to avoid sporadic failures in the nightly integration test build. --- ...sageListenerRecoveryCachingConnectionIntegrationTests.java | 2 +- .../SimpleMessageListenerContainerIntegrationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java index 921b7fcc..72540244 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java @@ -272,7 +272,7 @@ public class MessageListenerRecoveryCachingConnectionIntegrationTests { } private int getTimeout() { - return Math.min(1 + messageCount / (4 * concurrentConsumers), 30); + return Math.min(1 + messageCount / (2 * concurrentConsumers), 30); } private SimpleMessageListenerContainer createContainer(String queueName, Object listener, diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java index 54c21689..33970999 100755 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainerIntegrationTests.java @@ -183,7 +183,7 @@ public class SimpleMessageListenerContainerIntegrationTests { for (int i = 0; i < messageCount; i++) { template.convertAndSend(queue.getName(), i + "foo"); } - boolean waited = latch.await(Math.max(2, messageCount / 40), TimeUnit.SECONDS); + boolean waited = latch.await(Math.max(2, messageCount / 20), TimeUnit.SECONDS); assertTrue("Timed out waiting for message", waited); assertNull(template.receiveAndConvert(queue.getName())); } @@ -201,7 +201,7 @@ public class SimpleMessageListenerContainerIntegrationTests { } } try { - boolean waited = latch.await(5 + Math.max(1, messageCount / 20), TimeUnit.SECONDS); + boolean waited = latch.await(5 + Math.max(1, messageCount / 10), TimeUnit.SECONDS); assertTrue("Timed out waiting for message", waited); } finally { // Wait for broker communication to finish before trying to stop