Repository: qpid-jms Updated Branches: refs/heads/master 4e884f3c1 -> 0502aba74
add timeouts to integration tests Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0502aba7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0502aba7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0502aba7 Branch: refs/heads/master Commit: 0502aba7482490e1fda6672b02eca34289b49324 Parents: 4e884f3 Author: Robert Gemmell <rob...@apache.org> Authored: Thu Jan 29 15:00:19 2015 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Thu Jan 29 15:00:19 2015 +0000 ---------------------------------------------------------------------- .../apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java | 8 ++++---- .../apache/qpid/jms/failover/JmsTxProducerFailoverTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0502aba7/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java index a2c2735..f765d6a 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java @@ -49,7 +49,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { * Test that the TX doesn't start until the first ack so a failover * before that should allow Commit to work as expected. */ - @Test + @Test(timeout=60000) public void testTxConsumerReceiveAfterFailoverCommits() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -99,7 +99,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { assertEquals(0, proxy.getQueueSize()); } - @Test + @Test(timeout=60000) public void testTxConsumerReceiveThenFailoverCommitFails() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -136,7 +136,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { assertEquals(MSG_COUNT, proxy.getQueueSize()); } - @Test + @Test(timeout=60000) public void testTxConsumerRollbackAfterFailoverGetsNoErrors() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -180,7 +180,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { * Tests that if some receives happen and then a failover followed by additional * receives the commit will fail and no messages are left on the broker. */ - @Test + @Test(timeout=60000) public void testTxConsumerReceiveWorksAfterFailoverButCommitFails() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0502aba7/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java index 928bd0a..1028f63 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java @@ -48,7 +48,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { * Test that the TX doesn't start until the first send so a failover * before then should allow Commit to work as expected. */ - @Test + @Test(timeout=60000) public void testTxProducerSendAfterFailoverCommits() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -105,7 +105,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { * Tests that even if all sends complete prior to failover the commit that follows * will fail and the message are not present on the broker. */ - @Test + @Test(timeout=60000) public void testTxProducerSendsThenFailoverCommitFails() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -144,7 +144,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { assertEquals(0, proxy.getQueueSize()); } - @Test + @Test(timeout=60000) public void testTxProducerRollbackAfterFailoverGetsNoErrors() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); @@ -187,7 +187,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { * Tests that if some sends happen and then a failover followed by additional * sends the commit will fail and no messages are left on the broker. */ - @Test + @Test(timeout=60000) public void testTxProducerSendWorksButCommitFails() throws Exception { URI brokerURI = new URI("failover://("+ getBrokerAmqpConnectionURI() +")?maxReconnectDelay=100"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
