(AMQ-6858) - test fix (cherry picked from commit 2e3a7f6114fae1ffb9c19ee4af2f4541fdfc238e)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3285be60 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3285be60 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3285be60 Branch: refs/heads/activemq-5.15.x Commit: 3285be60ede1ee6cf377d4d4eeca6fbff79d5dec Parents: 247243c Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Wed Nov 15 09:21:44 2017 -0500 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Thu Nov 16 07:50:47 2017 -0500 ---------------------------------------------------------------------- .../activemq/network/DurableFiveBrokerNetworkBridgeTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/3285be60/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java index 2d8dc03..5bbd8b8 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java @@ -74,8 +74,6 @@ public class DurableFiveBrokerNetworkBridgeTest extends JmsMultipleBrokersTestSu } protected void testDurablePropagationBrokerRestart() throws Exception { - deletePersistentMessagesOnStartup = true; - // Setup broker networks bridgeBrokers("Broker_A_A", "Broker_B_B"); bridgeBrokers("Broker_B_B", "Broker_C_C"); @@ -665,6 +663,7 @@ public class DurableFiveBrokerNetworkBridgeTest extends JmsMultipleBrokersTestSu public void setUp() throws Exception { super.setAutoFail(true); super.setUp(); + deletePersistentMessagesOnStartup = true; String options = new String("?persistent=true&useJmx=false"); createBroker(new URI("broker:(tcp://localhost:61616)/Broker_A_A" + options)); createBroker(new URI("broker:(tcp://localhost:61617)/Broker_B_B" + options));