From 23f66ed55d3b3f804af5ae9eeef465f50eebded9 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Tue, 22 May 2012 07:35:48 -0400
Subject: [PATCH] AMQP-232 Failing Tests (Timeout)

Increase timeout to avoid intermittent test failures.
---
 ...eListenerRecoveryCachingConnectionIntegrationTests.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 72540244..50b93960 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
@@ -185,7 +185,10 @@ public class MessageListenerRecoveryCachingConnectionIntegrationTests {
 
 		CountDownLatch latch = new CountDownLatch(messageCount);
 		container = createContainer(queue.getName(), new AbortChannelListener(latch), createConnectionFactory());
-		Thread.sleep(500L);
+		int n = 0;
+		while (n++ < 100 && container.getActiveConsumerCount() != concurrentConsumers) {
+			Thread.sleep(50L);
+		}
 		assertEquals(concurrentConsumers, container.getActiveConsumerCount());
 
 		for (int i = 0; i < messageCount; i++) {
@@ -272,7 +275,7 @@ public class MessageListenerRecoveryCachingConnectionIntegrationTests {
 	}
 
 	private int getTimeout() {
-		return Math.min(1 + messageCount / (2 * concurrentConsumers), 30);
+		return Math.min(1 + messageCount / (concurrentConsumers), 30);
 	}
 
 	private SimpleMessageListenerContainer createContainer(String queueName, Object listener,