diff options
Diffstat (limited to 'qpid/java/systests')
2 files changed, 15 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java index 9f3a8f3cb4..737e7aa6a7 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java @@ -47,6 +47,7 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase protected Session _clientSession; protected Queue _queue; protected static final String MESSAGE_ID_PROPERTY = "MessageIDProperty"; + protected boolean CLUSTERED = Boolean.getBoolean("profile.clustered"); public void setUp() throws Exception { @@ -452,7 +453,10 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase sendMessages("connection1", messages); - sendMessages("connection2", messages); + if (!CLUSTERED) + { + sendMessages("connection2", messages); + } checkQueueDepth(messages); @@ -517,7 +521,10 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase int messages = 50; sendMessages("connection1", messages); - sendMessages("connection2", messages); + if (!CLUSTERED) + { + sendMessages("connection2", messages); + } failBroker(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java index 3f610aa15d..3a1fb50725 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java @@ -60,6 +60,7 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener private static int usedBrokers = 0; private CountDownLatch failoverComplete; private static final long DEFAULT_FAILOVER_TIME = 10000L; + private boolean CLUSTERED = Boolean.getBoolean("profile.clustered"); @Override protected void setUp() throws Exception @@ -158,9 +159,12 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener causeFailure(DEFAULT_FAILOVER_TIME); - msg = consumer.receive(500); + if (!CLUSTERED) + { + msg = consumer.receive(500); + assertNull("Should not have received message from new broker!", msg); + } - assertNull("Should not have received message from new broker!", msg); // Check that messages still sent / received sendMessages(totalMessages, transacted); consumeMessages(totalMessages, transacted); |