You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/09/12 21:14:01 UTC
activemq-artemis git commit: NO-JIRA Fix condition timeouts to avoid
spurious failures
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x afd912f50 -> 1ccb4c802
NO-JIRA Fix condition timeouts to avoid spurious failures
The waits for expiration are set at the same value as the expiration
interval default to in the test support setup so on some runs there is a
race when waiting for the message to expire and the expiry task.
(cherry picked from commit 5dbd0a74d229f7dcf7cae91eca91694d21861f4f)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1ccb4c80
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1ccb4c80
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1ccb4c80
Branch: refs/heads/2.6.x
Commit: 1ccb4c802e3aec52606fb580d644b77feb731b0b
Parents: afd912f
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Sep 12 16:43:57 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 12 17:13:55 2018 -0400
----------------------------------------------------------------------
.../artemis/tests/integration/amqp/AmqpExpiredMessageTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ccb4c80/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpExpiredMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpExpiredMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpExpiredMessageTest.java
index b130ba8..b8d9bee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpExpiredMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpExpiredMessageTest.java
@@ -85,7 +85,6 @@ public class AmqpExpiredMessageTest extends AmqpClientTestSupport {
Thread.sleep(100);
-
// Now try and get the message
AmqpReceiver receiver = session.createReceiver(getQueueName());
receiver.flow(1);
@@ -343,7 +342,7 @@ public class AmqpExpiredMessageTest extends AmqpClientTestSupport {
sender.send(message);
Queue dlq = getProxyToQueue(getDeadLetterAddress());
- assertTrue("Message not movied to DLQ", Wait.waitFor(() -> dlq.getMessageCount() > 0, 5000, 500));
+ assertTrue("Message not movied to DLQ", Wait.waitFor(() -> dlq.getMessageCount() > 0, 7000, 500));
connection.close();
@@ -388,7 +387,7 @@ public class AmqpExpiredMessageTest extends AmqpClientTestSupport {
sender.send(message);
Queue dlqView = getProxyToQueue(getDeadLetterAddress());
- assertTrue("Message not movied to DLQ", Wait.waitFor(() -> dlqView.getMessageCount() > 0, 5000, 200));
+ assertTrue("Message not movied to DLQ", Wait.waitFor(() -> dlqView.getMessageCount() > 0, 7000, 200));
// Read and Modify the message for redelivery repeatedly
AmqpReceiver receiver = session.createReceiver(getDeadLetterAddress());