Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 6eaa3abda -> 997428c5d


NO-JIRA fix flaky test QueueControlTest#testListMessagesWithEmptyFilter

The below error is prevented by using Wait.assertEquals
where Assert.assertEquals was used previously.

    java.lang.AssertionError:
    Expected :2
    Actual   :1
        [...]
        at 
org.apache.activemq.artemis.tests.integration.management.QueueControlTest.testListMessagesWithEmptyFilter(QueueControlTest.java:827)

(cherry picked from commit 5c2f79ed45993c843f6449cb6e649d157c64208b)


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/96421f64
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/96421f64
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/96421f64

Branch: refs/heads/2.6.x
Commit: 96421f64cc5303474cd5a59ad529a981cb406149
Parents: 6eaa3ab
Author: Jiri Danek <jda...@redhat.com>
Authored: Tue Aug 7 16:56:20 2018 +0200
Committer: Clebert Suconic <clebertsuco...@apache.org>
Committed: Wed Aug 8 11:32:16 2018 -0400

----------------------------------------------------------------------
 .../artemis/tests/integration/management/QueueControlTest.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/96421f64/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
----------------------------------------------------------------------
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index da8ea17..8eb6e03 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -823,13 +823,11 @@ public class QueueControlTest extends ManagementTestBase {
       producer.send(session.createMessage(durable));
       producer.send(session.createMessage(durable));
 
-      Map<String, Object>[] messages = queueControl.listMessages("");
-      Assert.assertEquals(2, messages.length);
+      Wait.assertEquals(2, () -> queueControl.listMessages("").length);
 
       consumeMessages(2, session, queue);
 
-      messages = queueControl.listMessages("");
-      Assert.assertEquals(0, messages.length);
+      Wait.assertEquals(0, () -> queueControl.listMessages("").length);
 
       session.deleteQueue(queue);
    }

Reply via email to