Author: davsclaus
Date: Tue Sep 11 09:13:00 2012
New Revision: 1383304
URL: http://svn.apache.org/viewvc?rev=1383304&view=rev
Log:
Fixing test on CI servers.
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java?rev=1383304&r1=1383303&r2=1383304&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/StartAndStopClientAndBrokerDoesNotLeaveThreadsRunningTest.java
Tue Sep 11 09:13:00 2012
@@ -78,16 +78,16 @@ public class StartAndStopClientAndBroker
}
public void runTest(Task task) throws Exception {
- int numThreads = Thread.currentThread().getThreadGroup().activeCount();
-// Thread.currentThread().getThreadGroup().list();
+ int before = Thread.currentThread().getThreadGroup().activeCount();
task.execute();
Thread.yield();
- Thread.sleep(2000); // Wait for the threads to exit on their own
+ // need to wait for slow servers
+ Thread.sleep(5000);
-// Thread.currentThread().getThreadGroup().list();
- int activeCount =
Thread.currentThread().getThreadGroup().activeCount();
- assertTrue("Should be at most one more thread but was: " +
activeCount, numThreads + 1 <= activeCount);
+ int after = Thread.currentThread().getThreadGroup().activeCount();
+ int diff = Math.abs(before - after);
+ assertTrue("Should be at most one more thread. Diff = " + diff, diff +
1 <= after);
}
}