summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index a3dd7e4a99..5e7ba5482d 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
@@ -339,10 +339,18 @@ public class RecoverTest extends FailoverBaseCase
int messageSeen = 0;
int expectedMsg = 0;
- // need to add a timer here as well.
+ long startTime = System.currentTimeMillis();
+
while(expectedMsg < 8)
{
- Message message = cons.receive();
+ // Based on historical data, on average the test takes about 6 secs to complete.
+ if (System.currentTimeMillis() - startTime > 8000)
+ {
+ fail("Test did not complete on time. Received " +
+ expectedMsg + " msgs so far. Please check the logs");
+ }
+
+ Message message = cons.receive(2000);
String text=((TextMessage) message).getText();
assertEquals("Received Message Out Of Order","Msg"+expectedMsg,text);
@@ -430,7 +438,8 @@ public class RecoverTest extends FailoverBaseCase
synchronized(lock)
{
- lock.wait(5000);
+ // Based on historical data, on average the test takes about 6 secs to complete.
+ lock.wait(8000);
}
if (!pass.get())