diff options
| author | Phil Harvey <philharveyonline@apache.org> | 2013-02-27 09:47:54 +0000 |
|---|---|---|
| committer | Phil Harvey <philharveyonline@apache.org> | 2013-02-27 09:47:54 +0000 |
| commit | 2a0e9d502d2c7c53213660300fb921f3ec0b874a (patch) | |
| tree | 4aae0892f4416465d79e485ad92a60eb838dbbf2 /qpid/java/perftests/src | |
| parent | f98cb21b5e8f2411ce7644f04867aed3aade9872 (diff) | |
| download | qpid-python-2a0e9d502d2c7c53213660300fb921f3ec0b874a.tar.gz | |
QPID-4606: Java performance test unit test timeouts increased to allow for slow CI servers
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1450696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/perftests/src')
3 files changed, 6 insertions, 7 deletions
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java index fa6335a2ae..08ee8715fd 100644 --- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ProducerParticipantTest.java @@ -132,7 +132,7 @@ public class ProducerParticipantTest extends QpidTestCase public void testSendMessagesForDuration() throws Exception { - final long duration = 100; + final long duration = 1000; _command.setMaximumDuration(duration); ParticipantResult result = _producer.doIt(CLIENT_NAME); diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java index 49ee6b3968..f773c727a1 100644 --- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java @@ -19,6 +19,8 @@ */ package org.apache.qpid.disttest.controller; +import static org.apache.qpid.systest.disttest.SystemTestConstants.COMMAND_RESPONSE_TIMEOUT; +import static org.apache.qpid.systest.disttest.SystemTestConstants.REGISTRATION_TIMEOUT; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; @@ -48,9 +50,6 @@ public class ControllerTest extends QpidTestCase { private static final String CLIENT1_REGISTERED_NAME = "client-uid1"; - private static final long COMMAND_RESPONSE_TIMEOUT = 1000; - private static final long REGISTRATION_TIMEOUT = 1000; - private Controller _controller; private ControllerJmsDelegate _respondingJmsDelegate; private TestRunner _testRunner; diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java index 808b428bc9..b06ab0c735 100644 --- a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java @@ -21,8 +21,8 @@ package org.apache.qpid.systest.disttest; public abstract class SystemTestConstants { - public static final long REGISTRATION_TIMEOUT = 5000; - public static final long COMMAND_RESPONSE_TIMEOUT = 10000; - public static final long TEST_RESULT_TIMEOUT = 5000; + public static final long REGISTRATION_TIMEOUT = 20000; + public static final long COMMAND_RESPONSE_TIMEOUT = 30000; + public static final long TEST_RESULT_TIMEOUT = 20000; } |