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/05/09 02:42:14 UTC
activemq-artemis git commit: NO-JIRA Improving test to avoid
clustering races
Repository: activemq-artemis
Updated Branches:
refs/heads/master 512d67504 -> 9387b9af4
NO-JIRA Improving test to avoid clustering races
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9387b9af
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9387b9af
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9387b9af
Branch: refs/heads/master
Commit: 9387b9af4ef3c966c4f675ac5c86af94f73a6e2d
Parents: 512d675
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 8 22:42:05 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 8 22:42:05 2018 -0400
----------------------------------------------------------------------
.../jms/cluster/TemporaryQueueClusterTest.java | 21 +++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9387b9af/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
index 4caf67e..e419a93 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
@@ -61,8 +61,12 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue targetQueue2 = session2.createQueue(QUEUE_NAME);
- // sleep a little bit to have the temp queue propagated to server #2
- Thread.sleep(3000);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, true, 1, 0, 2000);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, true, 1, 0, 2000);
+ this.waitForBindings(jmsServer2.getActiveMQServer(), QUEUE_NAME, false, 1, 0, 2000);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, false, 1, 0, 2000);
+
+
MessageProducer prod1 = session1.createProducer(targetQueue1);
MessageConsumer cons2 = session2.createConsumer(targetQueue2);
@@ -102,11 +106,18 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue targetQueue2 = session2.createQueue(QUEUE_NAME);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, true, 1, 0, 2000);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, true, 1, 0, 2000);
+ this.waitForBindings(jmsServer2.getActiveMQServer(), QUEUE_NAME, false, 1, 0, 2000);
+ this.waitForBindings(jmsServer1.getActiveMQServer(), QUEUE_NAME, false, 1, 0, 2000);
+
+ MessageConsumer tempCons1 = session1.createConsumer(tempQueue);
+
+ this.waitForBindings(jmsServer1.getActiveMQServer(), tempQueue.getQueueName(), true, 1, 1, 2000);
+ this.waitForBindings(jmsServer2.getActiveMQServer(), tempQueue.getQueueName(), false, 1, 0, 2000);
+
MessageProducer prod1 = session1.createProducer(targetQueue1);
MessageConsumer cons2 = session2.createConsumer(targetQueue2);
- MessageConsumer tempCons1 = session1.createConsumer(tempQueue);
- // sleep a little bit to have the temp queue propagated to server #2
- Thread.sleep(3000);
for (int i = 0; i < 10; i++) {
TextMessage message = session1.createTextMessage("" + i);