Repository: qpid-broker-j Updated Branches: refs/heads/master fbd973fd4 -> 81a3391d7
QPID-6933: [System Tests] Fix failing tests Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/81a3391d Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/81a3391d Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/81a3391d Branch: refs/heads/master Commit: 81a3391d7af842c94857aef19994c8248c3f5bf3 Parents: fbd973f Author: Alex Rudyy <[email protected]> Authored: Wed Jan 3 14:24:21 2018 +0000 Committer: Alex Rudyy <[email protected]> Committed: Wed Jan 3 14:24:21 2018 +0000 ---------------------------------------------------------------------- .../systests/jms_1_1/extensions/queue/LastValueQueueTest.java | 5 +++++ .../qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java | 4 ++++ .../qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java | 3 +++ 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/81a3391d/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/LastValueQueueTest.java ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/LastValueQueueTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/LastValueQueueTest.java index 1313417..fc737c8 100644 --- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/LastValueQueueTest.java +++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/LastValueQueueTest.java @@ -517,6 +517,10 @@ public class LastValueQueueTest extends JmsTestBase shutdownMessage.setStringProperty(KEY_PROPERTY, _threadName); backgroundProducer.send(shutdownMessage); + + // make sure that all in-flight messages reach the Broker + // before closing the connection + producerSession.createTemporaryQueue().delete(); } finally { @@ -528,6 +532,7 @@ public class LastValueQueueTest extends JmsTestBase catch (Exception e) { _exception = e; + LOGGER.warn("Unexpected exception in publisher", e); } }; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/81a3391d/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java index 5596e4a..d2475fa 100644 --- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java +++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/queue/SortedQueueTest.java @@ -146,6 +146,10 @@ public class SortedQueueTest extends JmsTestBase assertTrue("Messages were not received during expected time", receiveLatch.await(getReceiveTimeout() * NUMBER_OF_MESSAGES, TimeUnit.MILLISECONDS)); assertNull("Unexpected exception in message listener", listener.getException()); + + // make sure that all received messages are acknowledged before closing the session/connection + // otherwise session close can timeout for auto-ack + consumerSession.createTemporaryQueue().delete(); } finally { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/81a3391d/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java ---------------------------------------------------------------------- diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java index 1a5f163..7c73c95 100644 --- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java +++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java @@ -17,6 +17,7 @@ */ package org.apache.qpid.systests.jms_1_1.topic; +import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -42,6 +43,7 @@ import javax.jms.TopicSubscriber; import org.junit.Test; +import org.apache.qpid.server.model.Protocol; import org.apache.qpid.systests.JmsTestBase; public class DurableSubscribtionTest extends JmsTestBase @@ -467,6 +469,7 @@ public class DurableSubscribtionTest extends JmsTestBase @Test public void testResubscribeWithChangedNoLocal() throws Exception { + assumeThat("QPID-8068", getProtocol(), is(equalTo(Protocol.AMQP_1_0))); String subscriptionName = getTestName() + "_sub"; Topic topic = createTopic(getTestName()); String clientId = "testClientId"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
