[1/6] activemq-artemis git commit: NO-JIRA fix flaky tests QueueControlTest#testResetMessagesExpired

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 1b15f9555 -> 9109fc160


NO-JIRA fix flaky tests QueueControlTest#testResetMessagesExpired

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

    java.lang.AssertionError:
    Expected :1
    Actual   :0
    [...]
        at org.junit.Assert.assertEquals(Assert.java:542)
            at 
org.apache.activemq.artemis.tests.integration.management.QueueControlTest.testResetMessagesExpired(QueueControlTest.java:2370)


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

Branch: refs/heads/master
Commit: fed0426ff3714b66f1289fdaeb3d96088669debb
Parents: c6521e0
Author: Jiri Danek <jda...@redhat.com>
Authored: Tue Aug 7 20:16:18 2018 +0200
Committer: Clebert Suconic <clebertsuco...@apache.org>
Committed: Wed Aug 8 11:31:23 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fed0426f/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 9f4a93c..0faa055 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
@@ -2366,8 +2366,9 @@ public class QueueControlTest extends ManagementTestBase {
       producer.send(message);
 
       // the message IDs are set on the server
-      Map<String, Object>[] messages = queueControl.listMessages(null);
-      Assert.assertEquals(1, messages.length);
+      Map<String, Object>[] messages;
+      Wait.assertEquals(1, () -> queueControl.listMessages(null).length);
+      messages = queueControl.listMessages(null);
       long messageID = (Long) messages[0].get("messageID");
 
       queueControl.expireMessage(messageID);