Author: kwall
Date: Wed Apr 25 07:39:17 2012
New Revision: 1330139
URL: http://svn.apache.org/viewvc?rev=1330139&view=rev
Log:
QPID-3936: Fix for ControllerAndClientTest that occasionally fails on slow CI
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
Modified:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java?rev=1330139&r1=1330138&r2=1330139&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
Wed Apr 25 07:39:17 2012
@@ -45,9 +45,14 @@ import org.apache.qpid.disttest.message.
import org.apache.qpid.disttest.message.ProducerParticipantResult;
import org.apache.qpid.disttest.results.aggregation.ITestResult;
import org.apache.qpid.systest.disttest.DistributedTestSystemTestBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ControllerAndClientTest extends DistributedTestSystemTestBase
{
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ControllerAndClientTest.class);
+ private static final long CLIENT_BACKGROUND_THREAD_WAIT_TIME = 5000;
+
private Controller _controller;
@Override
@@ -226,8 +231,15 @@ public class ControllerAndClientTest ext
@Override
public void run()
{
- client.start();
- client.waitUntilStopped(1000);
+ try
+ {
+ client.start();
+
client.waitUntilStopped(CLIENT_BACKGROUND_THREAD_WAIT_TIME);
+ }
+ finally
+ {
+ LOGGER.debug("Client thread {} finished",
clientThreadName);
+ }
}
}, clientThreadName);
clientThread.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
