Author: kwall
Date: Fri May 18 13:51:55 2012
New Revision: 1340095
URL: http://svn.apache.org/viewvc?rev=1340095&view=rev
Log:
QPID-4006: Fix failing HA tests due to spaces in filenames on Apache CI servers
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
qpid/trunk/qpid/java/test-profiles/Excludes
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java?rev=1340095&r1=1340094&r2=1340095&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterBlackboxTest.java
Fri May 18 13:51:55 2012
@@ -58,8 +58,7 @@ public class HAClusterBlackboxTest exten
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();
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java?rev=1340095&r1=1340094&r2=1340095&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterTwoNodeTest.java
Fri May 18 13:51:55 2012
@@ -81,8 +81,7 @@ public class HAClusterTwoNodeTest extend
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;
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java?rev=1340095&r1=1340094&r2=1340095&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
Fri May 18 13:51:55 2012
@@ -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 exten
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 exten
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();
Modified: qpid/trunk/qpid/java/test-profiles/Excludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Excludes?rev=1340095&r1=1340094&r2=1340095&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/Excludes Fri May 18 13:51:55 2012
@@ -31,6 +31,3 @@ org.apache.qpid.server.logging.DerbyMess
org.apache.qpid.client.ssl.SSLTest#testVerifyLocalHostLocalDomain
-// QPID-4006 : temporarily exclude until the tests are updated to account for
-// the odd paths found in the ASF Jenkins test matrix workspaces
-org.apache.qpid.server.store.berkeleydb.*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
