QPID-4006: Fix failing HA tests due to spaces in filenames on Apache CI servers

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

3 files changed, 3 insertions, 9 deletions

diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
index afe0435901..900f528b76 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
@@ -58,8 +58,7 @@ public class HAClusterBlackboxTest extends QpidBrokerTestCase
         assertTrue(isJavaBroker());
         assertTrue(isBrokerStorePersistent());
 
-        setBrokerEnvironment("QPID_OPTS", "-Djava.util.logging.config.file=" + System.getProperty(QPID_HOME)
-                + File.separator + "etc" + File.separator + "log.properties");
+        setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties");
 
         _clusterCreator.configureClusterNodes();
 
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
index 5f995ae25d..2fdba5a7cf 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
@@ -81,8 +81,7 @@ public class HAClusterTwoNodeTest extends QpidBrokerTestCase
 
     private void startCluster(boolean autoDesignedPrimary) throws Exception
     {
-        setSystemProperty("java.util.logging.config.file",
-                System.getProperty(QPID_HOME) + File.separator + "etc" + File.separator + "log.properties");
+        setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties");
 
         String vhostPrefix = "virtualhosts.virtualhost." + VIRTUAL_HOST;
 
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
index 4b64466ff2..f694de61f2 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
@@ -37,8 +37,6 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.url.URLSyntaxException;
 
-import com.sleepycat.je.rep.InsufficientLogException;
-
 /**
  * The HA white box tests test the BDB cluster where the test retains the knowledge of the
  * individual test nodes.  It uses this knowledge to examine the nodes  to ensure that they
@@ -55,7 +53,6 @@ public class HAClusterWhiteboxTest extends QpidBrokerTestCase
     private final int NUMBER_OF_NODES = 3;
     private final HATestClusterCreator _clusterCreator = new HATestClusterCreator(this, VIRTUAL_HOST, NUMBER_OF_NODES);
 
-    // TODO Test for node falling behind
     // TODO Factory refactoring?? // MessageStore construction??
 
     @Override
@@ -66,8 +63,7 @@ public class HAClusterWhiteboxTest extends QpidBrokerTestCase
         assertTrue(isJavaBroker());
         assertTrue(isBrokerStorePersistent());
 
-        setBrokerEnvironment("QPID_OPTS", "-Djava.util.logging.config.file=" + System.getProperty(QPID_HOME)
-                + File.separator + "etc" + File.separator + "log.properties");
+        setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties");
 
         _clusterCreator.configureClusterNodes();
         _clusterCreator.startCluster();