Repository: qpid-jms Updated Branches: refs/heads/master 1039523dc -> 7da52038a
QPIDJMS-75: increase condition timeout period to allow for slow shared CI systems Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/80c4e445 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/80c4e445 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/80c4e445 Branch: refs/heads/master Commit: 80c4e445ddf00d6bc10a34d7418e4b30a77922d0 Parents: 1039523 Author: Robert Gemmell <[email protected]> Authored: Fri Jul 3 17:13:59 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Fri Jul 3 17:13:59 2015 +0100 ---------------------------------------------------------------------- .../apache/qpid/jms/integration/ConnectionIntegrationTest.java | 2 +- .../apache/qpid/jms/integration/ConsumerIntegrationTest.java | 2 +- .../apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java | 2 +- .../apache/qpid/jms/integration/ProducerIntegrationTest.java | 2 +- .../org/apache/qpid/jms/integration/SessionIntegrationTest.java | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80c4e445/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java index 772f89d..200e4f4 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java @@ -290,7 +290,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { public boolean isSatisified() throws Exception { return !((JmsConnection) connection).isConnected(); } - }, 1000, 10)); + }, 10000, 10)); try { connection.createSession(false, Session.AUTO_ACKNOWLEDGE); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80c4e445/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java index cf6e987..ae66557 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java @@ -94,7 +94,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { } return false; } - }, 2000, 10)); + }, 10000, 10)); // Try closing it explicitly, should effectively no-op in client. // The test peer will throw during close if it sends anything. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80c4e445/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java index b70c08d..6c1556c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java @@ -188,7 +188,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { public boolean isSatisified() throws Exception { return connection.isFailed(); } - }, configuredTimeout * 2, 10); + }, 10000, 10); assertTrue("connection didnt fail in expected timeframe", failed); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80c4e445/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 093833b..bd25982 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 @@ -555,7 +555,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { } return false; } - }, 2000, 10)); + }, 10000, 10)); // Try closing it explicitly, should effectively no-op in client. // The test peer will throw during close if it sends anything. http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/80c4e445/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 803d1c4..a421736 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 @@ -1282,7 +1282,6 @@ public class SessionIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); // Verify the producer gets marked closed - testPeer.waitForAllHandlersToComplete(1000); assertTrue("producer never closed.", Wait.waitFor(new Wait.Condition() { @Override public boolean isSatisified() throws Exception { @@ -1299,7 +1298,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } return false; } - }, 2000, 10)); + }, 10000, 10)); // Verify the session is now marked closed try { @@ -1353,7 +1352,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { } return false; } - }, 2000, 10)); + }, 10000, 10)); // Verify the session is now marked closed try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
