diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-10-06 22:07:12 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-10-06 22:07:12 +0000 |
| commit | 603d080069d660701261dd10943cad4ced22a830 (patch) | |
| tree | 2a79a396ea817c351b97644fb5b9a822ca5979fc /qpid/java | |
| parent | e5cd82a751b02fa1578e91ca21de271be03af3f7 (diff) | |
| download | qpid-python-603d080069d660701261dd10943cad4ced22a830.tar.gz | |
QPID-5161, QPID-5048: default the broker.log.interleave property in QBTC to allow removing the definition from the pom
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529706 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/pom.xml | 2 | ||||
| -rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 12dc22c9f1..584d0e09b7 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -41,7 +41,6 @@ - Add the test profiles, log4j config etc to a module which can be extracted by the others. - Then fix log4j configuration property to work with all modules. - Then fix what the systests/perftests do to copy the test-profiles dir to the encessary location. - - Default and remove broker log interleave property from tests. - Figure out dependency setup for optional bdbstore tests. - Add the other test profiles - Generate HTML reports of the test results @@ -442,7 +441,6 @@ <broker.command>${qpid.home}/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command> <broker.ready>BRK-1004</broker.ready> - <broker.log.interleave>true</broker.log.interleave> <profile>${profile}</profile> <!-- This must be a child of qpid home currently diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 8e380a65a1..8248fc9de2 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -171,7 +171,7 @@ public class QpidBrokerTestCase extends QpidTestCase protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT); protected static String _brokerLogPrefix = System.getProperty(BROKER_LOG_PREFIX,"BROKER: "); - protected static boolean _interleaveBrokerLog = Boolean.getBoolean(BROKER_LOG_INTERLEAVE); + protected static boolean _interleaveBrokerLog = Boolean.valueOf(System.getProperty(BROKER_LOG_INTERLEAVE,"true")); protected File _outputFile; |