Author: rgodfrey
Date: Tue Jun 2 18:37:36 2015
New Revision: 1683156
URL: http://svn.apache.org/r1683156
Log:
QPID-6565 : Ensure BrokerStartupTest properly removes all pre-existing config
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java?rev=1683156&r1=1683155&r2=1683156&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
Tue Jun 2 18:37:36 2015
@@ -32,6 +32,7 @@ import junit.framework.AssertionFailedEr
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.server.logging.AbstractTestLogging;
+import org.apache.qpid.util.FileUtils;
import org.apache.qpid.util.LogMonitor;
/**
@@ -71,8 +72,7 @@ public class BrokerStartupTest extends A
File brokerConfigFile = new File(getTestConfigFile(port));
if (brokerConfigFile.exists())
{
- // Config exists from previous test run, delete it.
- brokerConfigFile.delete();
+ FileUtils.delete(brokerConfigFile, true);
}
startBroker(port, null, null);
@@ -206,7 +206,7 @@ public class BrokerStartupTest extends A
if (brokerConfigFile.exists())
{
// Config exists from previous test run, delete it.
- brokerConfigFile.delete();
+ FileUtils.delete(brokerConfigFile, true);
}
startBroker(port, null, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
