Merge heads

Author: Simon MacMullen

test/src/com/rabbitmq/client/test/functional/PerQueueTTL.java

@@ -157,10 +157,10 @@ public void testTransactionalPublishWithGet() throws Exception {
      * Test expiry of re-queued messages
      */
     public void testExpiryWithRequeue() throws Exception {
-        declareAndBindQueue(100);
+        declareAndBindQueue(200);
 
         publish(MSG[0]);
-        Thread.sleep(50);
+        Thread.sleep(100);
         publish(MSG[1]);
         publish(MSG[2]);
 
@@ -170,7 +170,7 @@ public void testExpiryWithRequeue() throws Exception {
         closeChannel();
         openChannel();
 
-        Thread.sleep(60);
+        Thread.sleep(150);
         expectBodyAndRemainingMessages(MSG[1], 1);
         expectBodyAndRemainingMessages(MSG[2], 0);
     }