Roll back those changes, those timeouts depend on timing out. They should alomost certnily be replaced by assertDelivered(q, 0) but I'll leave that to Michael.

Author: Simon MacMullen

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

@@ -204,7 +204,7 @@ public void testThatDeletedQueueBindingsDontReappearOnRecovery() throws IOExcept
             closeAndWaitForRecovery(connection);
             expectChannelRecovery(channel);
             channel.basicPublish(x2, "", null, "msg".getBytes());
-            assertFalse(wait(latch));
+            assertFalse(latch.await(5, TimeUnit.SECONDS));
         } finally {
             channel.exchangeDelete(x2);
         }
@@ -226,7 +226,7 @@ public void testThatDeletedExchangeBindingsDontReappearOnRecovery() throws IOExc
             closeAndWaitForRecovery(connection);
             expectChannelRecovery(channel);
             channel.basicPublish(x2, "", null, "msg".getBytes());
-            assertFalse(wait(latch));
+            assertFalse(latch.await(5, TimeUnit.SECONDS));
         } finally {
             channel.exchangeDelete(x2);
         }