summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-08-07 18:06:27 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-08-07 18:06:27 +0000
commitb2b08fcef3a26ad10087c2d3450672100274aefe (patch)
tree14c790096bea232458646621d9813b0834577ab0 /qpid/java
parent8a2999bbdb2933257c954f51f135c5c3694e9afd (diff)
downloadqpid-python-b2b08fcef3a26ad10087c2d3450672100274aefe.tar.gz
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@802117 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 26263d5815..5a92de2b62 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/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");
}