Author: ritchiem
Date: Thu Jan 10 06:41:37 2008
New Revision: 610806
URL: http://svn.apache.org/viewvc?rev=610806&view=rev
Log:
QPID-690 : Relaxed the timings on failover as Thread.sleep is accurate to 10ms
so may finish the sleep 10ms early. Resulting in erratic failures as 9.9s < 10s.
Modified:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
Modified:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java?rev=610806&r1=610805&r2=610806&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
(original)
+++
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
Thu Jan 10 06:41:37 2008
@@ -78,9 +78,11 @@
long end = System.currentTimeMillis();
//Failover should take less that 10 seconds.
- // This is calculated by vm://:1 two retries left after initial
connection ( 4s)
+ // This is calculated by vm://:1 two retries left after initial
connection (4s)
// localhost get three retries so (6s) so 10s in total for
connection dropping
- assertTrue("Failover took over 10 seconds:"+(end - start), (end -
start) > 10000);
+ assertTrue("Failover took less than 9.5 seconds:"+(end - start),
(end - start) > 9500);
+ // The sleep method is not 100% accurate under windows so with 5
sleeps and a 10ms accuracy then there is
+ // the potential for the tests to finish in 500ms sooner than the
predicted 10s.
}
catch (AMQException e)
@@ -112,7 +114,9 @@
// This is calculated by vm://:1 two retries left after initial
connection
// so 4s in total for connection dropping
- assertTrue("Failover took over 4 seconds", (end - start) > 4000);
+ assertTrue("Failover took less than 3.7 seconds", (end - start) >
3700);
+ // The sleep method is not 100% accurate under windows so with 3
sleeps and a 10ms accuracy then there is
+ // the potential for the tests to finish in 300ms sooner than the
predicted 4s.
}
catch (AMQException e)
