Repository: activemq Updated Branches: refs/heads/trunk 9752e1dc9 -> c646fac75
increase test timeouts Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c646fac7 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c646fac7 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c646fac7 Branch: refs/heads/trunk Commit: c646fac75a33eeaab75272797eeb00408ac44874 Parents: 9752e1d Author: Dejan Bosanac <[email protected]> Authored: Fri Dec 26 11:50:16 2014 +0100 Committer: Dejan Bosanac <[email protected]> Committed: Fri Dec 26 11:50:16 2014 +0100 ---------------------------------------------------------------------- .../activemq/transport/tcp/SslContextNBrokerServiceTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/c646fac7/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java index 0f2aa25..03a1d84 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java @@ -46,12 +46,12 @@ public class SslContextNBrokerServiceTest { private ClassPathXmlApplicationContext context; Map<String, BrokerService> beansOfType; - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 3 * 60 * 1000) public void testDummyConfigurationIsolation() throws Exception { assertTrue("dummy bean has dummy cert", verifyCredentials("dummy")); } - @Test(timeout = 2 * 60 * 1000) + @Test(timeout = 3 * 60 * 1000) public void testActiveMQDotOrgConfigurationIsolation() throws Exception { assertTrue("good bean has amq cert", verifyCredentials("activemq.org")); } @@ -81,7 +81,7 @@ public class SslContextNBrokerServiceTest { SSLSocketFactory factory = context.getSocketFactory(); LOG.info("Connecting to broker: " + broker.getBrokerName() + " on: " + brokerUri.getHost() + ":" + brokerUri.getPort()); SSLSocket socket = (SSLSocket) factory.createSocket(brokerUri.getHost(), brokerUri.getPort()); - socket.setSoTimeout(60 * 1000); + socket.setSoTimeout(2 * 60 * 1000); socket.startHandshake(); socket.close();
