Repository: activemq Updated Branches: refs/heads/trunk 3a48b654c -> 2ba6689ee
Removed AutoFailTestSupport and changed surefire fork behavior to help with some runtime issues with AMQP tests, including AMQ-5062 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2ba6689e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2ba6689e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2ba6689e Branch: refs/heads/trunk Commit: 2ba6689ee5bc717536fed46fdc731463ac6a3b92 Parents: 3a48b65 Author: Kevin Earls <[email protected]> Authored: Tue Feb 18 14:43:58 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Tue Feb 18 14:43:58 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/activemq/transport/amqp/AMQ4920Test.java | 1 - .../java/org/apache/activemq/transport/amqp/AmqpTestSupport.java | 4 ---- 2 files changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/2ba6689e/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4920Test.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4920Test.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4920Test.java index 72f8b11..1279d17 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4920Test.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AMQ4920Test.java @@ -52,7 +52,6 @@ public class AMQ4920Test extends AmqpTestSupport { @Before public void setUp() throws Exception { super.setUp(); - this.autoFailTestSupport.setAutoFail(false); } @Test(timeout = 5 * 60 * 1000) http://git-wip-us.apache.org/repos/asf/activemq/blob/2ba6689e/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java index 4c5e749..23c895e 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTestSupport.java @@ -33,7 +33,6 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; -import org.apache.activemq.AutoFailTestSupport; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.broker.jmx.BrokerViewMBean; @@ -51,7 +50,6 @@ public class AmqpTestSupport { protected BrokerService brokerService; protected Vector<Throwable> exceptions = new Vector<Throwable>(); protected int numberOfMessages; - AutoFailTestSupport autoFailTestSupport = new AutoFailTestSupport() {}; protected int port; protected int sslPort; protected int nioPort; @@ -69,7 +67,6 @@ public class AmqpTestSupport { @Before public void setUp() throws Exception { - autoFailTestSupport.startAutoFailThread(); exceptions.clear(); startBroker(); this.numberOfMessages = 2000; @@ -143,7 +140,6 @@ public class AmqpTestSupport { @After public void tearDown() throws Exception { stopBroker(); - autoFailTestSupport.stopAutoFailThread(); } public void sendMessages(Connection connection, Destination destination, int count) throws Exception {
