Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some improvements for org.apache.activemq.ra.JmsXARollback2CxTransactionTest test as it fails in hudson 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@935501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-04-19 09:54:19 +00:00
parent 789789f06b
commit 358b522b8d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
View File

@ -81,6 +81,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
protected void setUp() throws Exception { protected void setUp() throws Exception {
broker = createBroker(); broker = createBroker();
broker.start(); broker.start();
broker.waitUntilStarted();
resourceProvider = getJmsResourceProvider(); resourceProvider = getJmsResourceProvider();
topic = resourceProvider.isTopic(); topic = resourceProvider.isTopic();
@ -129,6 +130,7 @@ public abstract class JmsTransactionTestSupport extends TestSupport implements M
connection.close(); connection.close();
connection = null; connection = null;
broker.stop(); broker.stop();
broker.waitUntilStopped();
broker = null; broker = null;
LOG.info("Connection closed."); LOG.info("Connection closed.");

8
activemq-ra/src/test/resources/log4j.properties
View File

@ -18,10 +18,10 @@
# #
# The logging properties used during tests.. # The logging properties used during tests..
# #
log4j.rootLogger=INFO, out log4j.rootLogger=INFO, out, stdout
log4j.logger.org.apache.activemq.spring=WARN log4j.logger.org.apache.activemq.spring=WARN
log4j.logger.org.apache.activemq=INFO #log4j.logger.org.apache.activemq.ra=DEBUG
# CONSOLE appender not used by default # CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@ -32,5 +32,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
log4j.appender.out=org.apache.log4j.FileAppender log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
log4j.appender.out.file=target/test-reports/activemq-test.log log4j.appender.out.file=target/activemq-test.log
log4j.appender.out.append=false log4j.appender.out.append=true