summaryrefslogtreecommitdiff
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
commit1ce96b52350006616fdb304ecde706b2c7c4de90 (patch)
tree6f204d13ca2e8d4ff6780bafdc56c16ec3f0ea0e
parent4bfd6525564db5924243a4d146abbab7abcdc562 (diff)
downloadqpid-python-1ce96b52350006616fdb304ecde706b2c7c4de90.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/qpid@1609641 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
index 98d4e3b33b..9f5dd2ec39 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
+++ b/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://"