Updated Branches: refs/heads/trunk 4350ded2c -> ef82a4b8b
Added short sleep to tearDown, see https://issues.apache.org/jira/browse/AMQ-4854 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ef82a4b8 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ef82a4b8 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ef82a4b8 Branch: refs/heads/trunk Commit: ef82a4b8b469761eb2c995617b64c5ce95acb008 Parents: 4350ded Author: Kevin Earls <[email protected]> Authored: Fri Feb 14 17:36:47 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Fri Feb 14 17:36:47 2014 +0100 ---------------------------------------------------------------------- .../apache/activemq/JmsRollbackRedeliveryTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ef82a4b8/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java index 7952a97..91e29c0 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; import static org.junit.Assert.*; -public class JmsRollbackRedeliveryTest /*extends AutoFailTestSupport*/ { +public class JmsRollbackRedeliveryTest { @Rule public TestName testName = new TestName(); @@ -55,26 +55,22 @@ public class JmsRollbackRedeliveryTest /*extends AutoFailTestSupport*/ { @Before public void setUp() throws Exception { - //setAutoFail(true); - //super.setUp(); - - LOG.info(">>>> Starting " + testName.getMethodName()); + LOG.debug("Starting " + testName.getMethodName()); broker = new BrokerService(); broker.setPersistent(false); broker.setUseJmx(false); broker.start(); broker.waitUntilStarted(); - - } @After public void tearDown() throws Exception { - //super.tearDown(); if (broker != null) { broker.stop(); broker.waitUntilStopped(); } + LOG.debug("Finishing " + testName.getMethodName()); + Thread.sleep(100); } @Test @@ -99,7 +95,7 @@ public class JmsRollbackRedeliveryTest /*extends AutoFailTestSupport*/ { } public void doTestRedelivery(String brokerUrl, boolean interleaveProducer) throws Exception { - LOG.info(">>>> entering doTestRedelivery interleaveProducer is " + interleaveProducer); + LOG.debug("entering doTestRedelivery interleaveProducer is " + interleaveProducer); ConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUrl); Connection connection = connectionFactory.createConnection();
