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 2015/01/28 20:11:46 UTC
[1/2] activemq-6 git commit: fix race in test
Repository: activemq-6
Updated Branches:
refs/heads/master 90b8b35b5 -> c6a444fe5
fix race in test
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d895988f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d895988f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d895988f
Branch: refs/heads/master
Commit: d895988faf267aa39fe5b37312bd2cbdaa8168f3
Parents: 90b8b35
Author: jbertram <jb...@redhat.com>
Authored: Tue Jan 27 13:29:05 2015 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Tue Jan 27 15:40:15 2015 -0600
----------------------------------------------------------------------
.../jms/server/management/JMSServerControlTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d895988f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
index d36492f..0dd1900 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
@@ -562,6 +562,14 @@ public class JMSServerControlTest extends ManagementTestBase
Assert.assertNull(fakeJMSStorageManager.destinationMap.get(queueName));
+ long timeout = System.currentTimeMillis() + 1000;
+ while (timeout > System.currentTimeMillis() && !((ActiveMQMessageConsumer)cons).isClosed())
+ {
+ Thread.sleep(1);
+ }
+
+ Assert.assertTrue(((ActiveMQMessageConsumer)cons).isClosed());
+
try
{
cons.receive(5000);
[2/2] activemq-6 git commit: This closes #84 - fixing races on tests
Posted by cl...@apache.org.
This closes #84 - fixing races on tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/c6a444fe
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/c6a444fe
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/c6a444fe
Branch: refs/heads/master
Commit: c6a444fe5c97b48a3ed61dff839378f10501dae4
Parents: 90b8b35 d895988
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jan 28 14:10:22 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jan 28 14:10:22 2015 -0500
----------------------------------------------------------------------
.../jms/server/management/JMSServerControlTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------