diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-10-17 13:58:04 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-10-17 13:58:04 +0000 |
| commit | 5e8136af6e36d5f2689dd07e70095546c0120dbc (patch) | |
| tree | 4b824e122d1cbb810e632dd4286c31227a16f414 /java/bdbstore/systests/src/test/java/org/apache | |
| parent | e823be1ce23fc8970afc7f437eb84c164c70d837 (diff) | |
| download | qpid-python-5e8136af6e36d5f2689dd07e70095546c0120dbc.tar.gz | |
merged from trunkQPID-6125-ProtocolRefactoring
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6125-ProtocolRefactoring@1632579 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/bdbstore/systests/src/test/java/org/apache')
5 files changed, 8 insertions, 0 deletions
diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java index cfbd030474..45cf9a483c 100644 --- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java +++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostNodeRestTest.java @@ -65,6 +65,7 @@ public class BDBHAVirtualHostNodeRestTest extends QpidRestTestCase public void setUp() throws Exception { setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME, "1000"); + setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); super.setUp(); _hostName = getTestName(); diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java index f73a2878d3..d0166510ba 100644 --- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java +++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/BDBHAVirtualHostRestTest.java @@ -57,6 +57,8 @@ public class BDBHAVirtualHostRestTest extends QpidRestTestCase public void setUp() throws Exception { setTestSystemProperty(ReplicatedEnvironmentFacade.REMOTE_NODE_MONITOR_INTERVAL_PROPERTY_NAME, "1000"); + setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); + _hostName = "ha"; _nodeName = "node1"; _storeBaseDir = new File(TMP_FOLDER, "store-" + _hostName + "-" + System.currentTimeMillis()); diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java index 63de287be7..4fd3540964 100644 --- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java +++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java @@ -74,6 +74,8 @@ public class JMXManagementTest extends QpidBrokerTestCase { _brokerType = BrokerType.SPAWNED; + setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); + _clusterCreator.configureClusterNodes(); _brokerFailoverUrl = _clusterCreator.getConnectionUrlForAllClusterNodes(); _clusterCreator.startCluster(); diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java index 38484b546f..77b1f3fed4 100644 --- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java +++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java @@ -81,6 +81,7 @@ public class MultiNodeTest extends QpidBrokerTestCase assertTrue(isBrokerStorePersistent()); setSystemProperty("java.util.logging.config.file", "etc" + File.separator + "log.properties"); + setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); _groupCreator.configureClusterNodes(); diff --git a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java index 248dbb4def..49ce60d798 100644 --- a/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java +++ b/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/TwoNodeTest.java @@ -49,6 +49,8 @@ public class TwoNodeTest extends QpidBrokerTestCase { _brokerType = BrokerType.SPAWNED; + setTestClientSystemProperty("log4j.configuration", getBrokerCommandLog4JFile().toURI().toString()); + assertTrue(isJavaBroker()); assertTrue(isBrokerStorePersistent()); |