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 2016/09/15 17:17:03 UTC
[1/2] qpid-jms git commit: QPIDJMS-207: fix race to avoid sporadic
failure, adjust a timeout to reflect its units
Repository: qpid-jms
Updated Branches:
refs/heads/master 8494d1812 -> 9903b1c6d
QPIDJMS-207: fix race to avoid sporadic failure, adjust a timeout to reflect its units
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/34c6a7d3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/34c6a7d3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/34c6a7d3
Branch: refs/heads/master
Commit: 34c6a7d36f542a4bede9318ede07081d195703ec
Parents: 8494d18
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Sep 15 17:49:44 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Sep 15 17:49:44 2016 +0100
----------------------------------------------------------------------
.../qpid/jms/integration/ProducerIntegrationTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/34c6a7d3/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
index d34aae6..9bca0cd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
@@ -1014,12 +1014,12 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
final String BREAD_CRUMB = "ErrorMessage";
try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
- final AtomicBoolean producerClosed = new AtomicBoolean();
+ final CountDownLatch producerClosed = new CountDownLatch(1);
JmsConnection connection = (JmsConnection) testFixture.establishConnecton(testPeer);
connection.addConnectionListener(new JmsDefaultConnectionListener() {
@Override
public void onProducerClosed(MessageProducer producer, Exception exception) {
- producerClosed.set(true);
+ producerClosed.countDown();
}
});
@@ -1052,13 +1052,14 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
fail("No expected exception for this send.");
}
- testPeer.waitForAllHandlersToComplete(1000);
+ testPeer.waitForAllHandlersToComplete(2000);
- // Verify the producer gets marked closed
- assertTrue(listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ // Verify the sends gets marked errored
+ assertTrue(listener.awaitCompletion(5, TimeUnit.SECONDS));
assertEquals(MSG_COUNT, listener.errorCount);
- // Verify the session is now marked closed
+ // Verify the producer gets marked closed
+ assertTrue("Producer closed callback didn't trigger", producerClosed.await(5, TimeUnit.SECONDS));
try {
producer.getDeliveryMode();
fail("Expected ISE to be thrown due to being closed");
@@ -1068,7 +1069,6 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
assertTrue(errorMessage.contains(BREAD_CRUMB));
}
- assertTrue("Producer closed callback didn't trigger", producerClosed.get());
// Try closing it explicitly, should effectively no-op in client.
// The test peer will throw during close if it sends anything.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: QPIDJMS-207: fix some more timeouts
Posted by ro...@apache.org.
QPIDJMS-207: fix some more timeouts
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9903b1c6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9903b1c6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9903b1c6
Branch: refs/heads/master
Commit: 9903b1c6d8b234ab76cd5f64ba229303eaff4d49
Parents: 34c6a7d
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Sep 15 18:10:00 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Sep 15 18:10:00 2016 +0100
----------------------------------------------------------------------
.../integration/ProducerIntegrationTest.java | 20 ++++++++++----------
.../jms/integration/SessionIntegrationTest.java | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9903b1c6/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
index 9bca0cd..75d8ee4 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
@@ -1259,11 +1259,11 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
try {
producer.send(message, listener);
} catch (Throwable error) {
- LOG.info("Caught expected error: {}", error.getMessage());
+ LOG.info("Caught unexpected error: {}", error.getMessage());
fail("Send should not fail for async.");
}
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNotNull(listener.exception);
assertTrue(listener.exception instanceof JmsSendTimedOutException);
assertNotNull(listener.message);
@@ -1934,7 +1934,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertTrue(listener.message instanceof TextMessage);
@@ -1969,7 +1969,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertTrue(listener.message instanceof BytesMessage);
@@ -2063,7 +2063,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
fail("No expected exception for this send.");
}
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNotNull(listener.exception);
assertNotNull(listener.message);
assertTrue(listener.message instanceof TextMessage);
@@ -2079,7 +2079,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
fail("No expected exception for this send.");
}
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertTrue(listener.message instanceof TextMessage);
@@ -2126,7 +2126,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertTrue(listener.message instanceof TextMessage);
@@ -2175,7 +2175,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertNotNull(closeError.get());
@@ -2246,7 +2246,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertNotNull(commitError.get());
@@ -2317,7 +2317,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
producer.send(message, listener);
- assertTrue("Did not get async callback", listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue("Did not get async callback", listener.awaitCompletion(5, TimeUnit.SECONDS));
assertNull(listener.exception);
assertNotNull(listener.message);
assertNotNull(rollback.get());
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9903b1c6/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index 3cc2bab..e352b7d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -1744,10 +1744,10 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
fail("No expected exception for this send.");
}
- testPeer.waitForAllHandlersToComplete(1000);
+ testPeer.waitForAllHandlersToComplete(2000);
// Verify the producer gets marked closed
- assertTrue(listener.awaitCompletion(2000, TimeUnit.SECONDS));
+ assertTrue(listener.awaitCompletion(5, TimeUnit.SECONDS));
assertEquals(MSG_COUNT, listener.errorCount);
assertEquals(0, listener.successCount);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org