diff options
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java | 13 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java index d417349c7f..5a28f18e80 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java @@ -154,10 +154,19 @@ public class BrokerLoggingTest extends AbstractTestLogging //Remove test Log4j config from the commandline _broker = _broker.substring(0, _broker.indexOf("-l")); + // As a result we will pick up the broker default and will right + // data to the standard qpid.log file. Which means that the start + // broker process will not be monitoring the right file for startup. + + // Set the broker commit ready string to check for the _log4j default + System.setProperty(BROKER_READY, "Qpid Broker Ready"); + startBroker(); - // Now we can create the monitor as _outputFile will now be defined - _monitor = new LogMonitor(_outputFile); + // Now we can create the monitor on the qpid.log that is defined in + // the default log4j configuration + _monitor = new LogMonitor(new File(System.getProperty("QPID_WORK") + + "/log/qpid.log")); // Ensure broker has fully started up. getConnection(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 02c8ed2c10..b6ee6083b2 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -145,7 +145,7 @@ public class QpidTestCase extends TestCase private static final String BROKER = "broker"; private static final String BROKER_CLEAN = "broker.clean"; private static final String BROKER_VERSION = "broker.version"; - private static final String BROKER_READY = "broker.ready"; + protected static final String BROKER_READY = "broker.ready"; private static final String BROKER_STOPPED = "broker.stopped"; private static final String TEST_OUTPUT = "test.output"; |