QPID-3936: Fix for ControllerAndClientTest that occasionally fails on slow CI

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1330139 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 2 deletions

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
index e8790ea7f6..9fd90d3215 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
@@ -45,9 +45,14 @@ import org.apache.qpid.disttest.message.ParticipantResult;
 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 extends DistributedTestSystemTestBase
             @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();