QPID-2033 : Update to QpidTestCase to ensure that external broker is fully shutdown when it fails to startup in the allotted time.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 26263d5815..5a92de2b62 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -418,6 +418,8 @@ public class QpidTestCase extends TestCase
             if (!p.await(30, TimeUnit.SECONDS))
             {
                 _logger.info("broker failed to become ready");
+                //Ensure broker has stopped
+                process.destroy();
                 cleanBroker();
                 throw new RuntimeException("broker failed to become ready");
             }