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/08/08 15:33:05 UTC
[1/5] activemq-artemis git commit: NO-JIRA fix flaky test
QueueControlTest#testListMessagesWithEmptyFilter
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 <jd...@redhat.com>
Authored: Tue Aug 7 16:56:20 2018 +0200
Committer: Clebert Suconic <cl...@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);
}
[4/5] activemq-artemis git commit: NO-JIRA fix flaky tests
QueueControlTest#testChangeMessagePriority{, WithInvalidValue}
Posted by cl...@apache.org.
NO-JIRA fix flaky tests QueueControlTest#testChangeMessagePriority{,WithInvalidValue}
The occasional assertion error is prevented by using Wait.assertEquals
where Assert.assertEquals was used previously.
(cherry picked from commit c6521e0700006de1a00b614768168a0f96c5e28b)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f2852cb9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f2852cb9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f2852cb9
Branch: refs/heads/2.6.x
Commit: f2852cb9dcdf7617a65bf763a59d28e43d1eff9a
Parents: b08bff0
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 20:02:41 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:32:45 2018 -0400
----------------------------------------------------------------------
.../artemis/tests/integration/management/QueueControlTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f2852cb9/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 46d360e..9f4a93c 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
@@ -1926,7 +1926,7 @@ public class QueueControlTest extends ManagementTestBase {
producer.send(message);
QueueControl queueControl = createManagementControl(address, queue);
- Assert.assertEquals(1, getMessageCount(queueControl));
+ Wait.assertEquals(1, () -> getMessageCount(queueControl));
// the message IDs are set on the server
Map<String, Object>[] messages = queueControl.listMessages(null);
@@ -1959,7 +1959,7 @@ public class QueueControlTest extends ManagementTestBase {
producer.send(message);
QueueControl queueControl = createManagementControl(address, queue);
- Assert.assertEquals(1, getMessageCount(queueControl));
+ Wait.assertEquals(1, () -> getMessageCount(queueControl));
// the message IDs are set on the server
Map<String, Object>[] messages = queueControl.listMessages(null);
[2/5] activemq-artemis git commit: NO-JIRA fix flaky test
QueueControlTest#testListMessagesWithNullFilter
Posted by cl...@apache.org.
NO-JIRA fix flaky test QueueControlTest#testListMessagesWithNullFilter
The below error is prevented by using Wait.assertEquals
where Assert.assertEquals was used previously.
java.lang.AssertionError:
Expected :2
Actual :1
[...]
at org.junit.Assert.assertEquals(Assert.java:542)
at org.apache.activemq.artemis.tests.integration.management.QueueControlTest.testListMessagesWithNullFilter(QueueControlTest.java:804)
(cherry picked from commit fbb622ae6976209a0d2d4ec1852ca8b91c4cf1e9)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2fdcc9f1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2fdcc9f1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2fdcc9f1
Branch: refs/heads/2.6.x
Commit: 2fdcc9f1e059ee9e7a139de9471e1f12f5f916b7
Parents: 96421f6
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 16:59:30 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:32:26 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/2fdcc9f1/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 8eb6e03..fb0a3e5 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
@@ -800,13 +800,11 @@ public class QueueControlTest extends ManagementTestBase {
producer.send(session.createMessage(durable));
producer.send(session.createMessage(durable));
- Map<String, Object>[] messages = queueControl.listMessages(null);
- Assert.assertEquals(2, messages.length);
+ Wait.assertEquals(2, () -> queueControl.listMessages(null).length);
consumeMessages(2, session, queue);
- messages = queueControl.listMessages(null);
- Assert.assertEquals(0, messages.length);
+ Wait.assertEquals(0, () -> queueControl.listMessages(null).length);
session.deleteQueue(queue);
}
[3/5] activemq-artemis git commit: NO-JIRA fix flaky test
QueueControlTest#testResetMessagesAdded
Posted by cl...@apache.org.
NO-JIRA fix flaky test QueueControlTest#testResetMessagesAdded
The occasional assertion error is prevented by using Wait.assertEquals
where Assert.assertEquals was used previously.
I did not observe the timing issue on all asserts (only on the first
two), but there is no harm in replacing them all.
java.lang.AssertionError:
Expected :2
Actual :1
(cherry picked from commit 23a30b61587a0b78c8bbc210e42bc0a8b18d03d6)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b08bff0a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b08bff0a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b08bff0a
Branch: refs/heads/2.6.x
Commit: b08bff0a51ab463d186663bb8b4c6e0eb4342fcf
Parents: 2fdcc9f
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 17:10:00 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:32:36 2018 -0400
----------------------------------------------------------------------
.../tests/integration/management/QueueControlTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b08bff0a/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 fb0a3e5..46d360e 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
@@ -2311,17 +2311,17 @@ public class QueueControlTest extends ManagementTestBase {
ClientProducer producer = session.createProducer(address);
producer.send(session.createMessage(durable));
- Assert.assertEquals(1, getMessagesAdded(queueControl));
+ Wait.assertEquals(1, () -> getMessagesAdded(queueControl));
producer.send(session.createMessage(durable));
- Assert.assertEquals(2, getMessagesAdded(queueControl));
+ Wait.assertEquals(2, () -> getMessagesAdded(queueControl));
consumeMessages(2, session, queue);
- Assert.assertEquals(2, getMessagesAdded(queueControl));
+ Wait.assertEquals(2, () -> getMessagesAdded(queueControl));
queueControl.resetMessagesAdded();
- Assert.assertEquals(0, getMessagesAdded(queueControl));
+ Wait.assertEquals(0, () -> getMessagesAdded(queueControl));
session.deleteQueue(queue);
}
[5/5] activemq-artemis git commit: NO-JIRA fix flaky tests
QueueControlTest#testResetMessagesExpired
Posted by cl...@apache.org.
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)
(cherry picked from commit fed0426ff3714b66f1289fdaeb3d96088669debb)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/997428c5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/997428c5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/997428c5
Branch: refs/heads/2.6.x
Commit: 997428c5de28ae422c3df25e650a23d9adf87103
Parents: f2852cb
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue Aug 7 20:16:18 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 8 11:32:54 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/997428c5/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);