Author: kwall
Date: Fri Apr 29 08:53:33 2016
New Revision: 1741581
URL: http://svn.apache.org/viewvc?rev=1741581&view=rev
Log:
NO-JIRA: [Java System Tests] Make failover wait time configurable and increase
length of time allowed on Apache CI
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1741581&r1=1741580&r2=1741581&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
Fri Apr 29 08:53:33 2016
@@ -1413,7 +1413,7 @@ public class FailoverBehaviourTest exten
private void awaitForFailoverCompletion(long delay)
{
- _logger.info("Awaiting Failover completion..");
+ _logger.info("Awaiting {} ms for failover completion..", delay);
try
{
if (!_failoverComplete.await(delay, TimeUnit.MILLISECONDS))
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=1741581&r1=1741580&r2=1741581&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
Fri Apr 29 08:53:33 2016
@@ -34,7 +34,7 @@ public class FailoverBaseCase extends Qp
{
protected static final Logger _logger =
LoggerFactory.getLogger(FailoverBaseCase.class);
- public static final long DEFAULT_FAILOVER_TIME = 10000L;
+ public static final long DEFAULT_FAILOVER_TIME =
Long.getLong("FailoverBaseCase.defaultFailoverTime", 10000L);
protected CountDownLatch _failoverStarted;
protected CountDownLatch _failoverComplete;
Modified: qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties?rev=1741581&r1=1741580&r2=1741581&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties
(original)
+++ qpid/java/trunk/test-profiles/apache-ci.test.overridden.properties Fri Apr
29 08:53:33 2016
@@ -22,3 +22,4 @@
qpid.port.protocol_handshake_timeout=10000
AbstractQueueTestBase.queueRunnerWaitTime=500
+FailoverBaseCase.defaultFailoverTime=15000
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
