From 9ed762ee9f06df53c31adf2f345083f4e077cc37 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sat, 4 Feb 2012 15:20:14 +0000 Subject: QPID-3794: calculate a sleep interval to account for previous overlsleep, to help avoid ocasional failures in StatisticsCounterTest.testPeakOutOfOrder Applied patch from Oleksandr Rudyy (with small update to prevent a negative value being used) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240518 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/stats/StatisticsCounterTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java index fbaa1342c9..147879f5e8 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java @@ -106,7 +106,12 @@ public class StatisticsCounterTest extends TestCase Thread.sleep(1500); assertEquals(0.0, counter.getPeak()); counter.registerEvent(2000, start + 1500); - Thread.sleep(1000L); + + // make sure, that getPeak invocation occurs at "start + 2500" + // if test thread over-sleeps for 500+ mls + // the peak value can be incremented and test will fail + long sleep = start + 2500 - System.currentTimeMillis(); + Thread.sleep(sleep < 0 ? 0 : sleep); assertEquals(0.0, counter.getPeak()); counter.registerEvent(1000, start + 500); Thread.sleep(1500); -- cgit v1.2.1