summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-07-11 07:39:20 +0000
committerKeith Wall <kwall@apache.org>2014-07-11 07:39:20 +0000
commit7742b3e7320a262afeeb865370357db6d06850ce (patch)
tree80bfd68a07a5ca276cac861f6fecce167e0bf473 /qpid/java
parent4d43f0527cc99d9257808fcb3f246dbc9b8aee61 (diff)
downloadqpid-python-7742b3e7320a262afeeb865370357db6d06850ce.tar.gz
NO-JIRA: BrokerStartupTest now deletes Broker config left by previous test run, to avoid failure if not cleaned between runs
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1609641 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
index 98d4e3b33b..9f5dd2ec39 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
@@ -69,6 +69,13 @@ public class BrokerStartupTest extends AbstractTestLogging
setTestSystemProperty("qpid.rmi_port",String.valueOf(connectorServerPort));
setTestSystemProperty("qpid.http_port",String.valueOf(DEFAULT_HTTP_MANAGEMENT_PORT));
+ File brokerConfigFile = new File(getTestConfigFile(port));
+ if (brokerConfigFile.exists())
+ {
+ // Config exists from previous test run, delete it.
+ brokerConfigFile.delete();
+ }
+
startBroker(port, null);
AMQConnectionURL url = new AMQConnectionURL(String.format("amqp://"