You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/04/23 15:32:44 UTC
qpid-jms git commit: QPIDJMS-380: fix test names,
avoid races in tests leading to sporadic failures
Repository: qpid-jms
Updated Branches:
refs/heads/master 06f83e2de -> 43705abfa
QPIDJMS-380: fix test names, avoid races in tests leading to sporadic failures
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/43705abf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/43705abf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/43705abf
Branch: refs/heads/master
Commit: 43705abfa712e2cafa296638597e732ea659a131
Parents: 06f83e2
Author: Robbie Gemmell <ro...@apache.org>
Authored: Mon Apr 23 16:32:22 2018 +0100
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Mon Apr 23 16:32:22 2018 +0100
----------------------------------------------------------------------
.../jms/integration/ConnectionConsumerIntegrationTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/43705abf/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java
index 934b385..f92357d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java
@@ -84,12 +84,12 @@ public class ConnectionConsumerIntegrationTest extends QpidJmsTestCase {
}
@Test(timeout = 20000)
- public void testConnectionConsumerDispatchesToSessionConnectionSratedBeforeCreate() throws Exception {
+ public void testConnectionConsumerDispatchesToSessionConnectionStartedBeforeCreate() throws Exception {
doTestConnectionConsumerDispatchesToSession(true);
}
@Test(timeout = 20000)
- public void testConnectionConsumerDispatchesToSessionConnectionSratedAfterCreate() throws Exception {
+ public void testConnectionConsumerDispatchesToSessionConnectionStartedAfterCreate() throws Exception {
doTestConnectionConsumerDispatchesToSession(false);
}
@@ -133,6 +133,7 @@ public class ConnectionConsumerIntegrationTest extends QpidJmsTestCase {
}
assertTrue("Message didn't arrive in time", messageArrived.await(10, TimeUnit.SECONDS));
+ testPeer.waitForAllHandlersToComplete(2000);
testPeer.expectDetach(true, true, true);
consumer.close();
@@ -239,6 +240,7 @@ public class ConnectionConsumerIntegrationTest extends QpidJmsTestCase {
connection.start();
assertTrue("Message didn't arrive in time", messagesArrived.await(10, TimeUnit.SECONDS));
+ testPeer.waitForAllHandlersToComplete(2000);
testPeer.expectDetach(true, true, true);
consumer.close();
@@ -301,6 +303,7 @@ public class ConnectionConsumerIntegrationTest extends QpidJmsTestCase {
connection.start();
assertTrue("Message didn't arrive in time", messagesArrived.await(10, TimeUnit.SECONDS));
+ testPeer.waitForAllHandlersToComplete(2000);
testPeer.expectDetach(true, true, true);
consumer.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org