qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1546331 - in /qpid/trunk/qpid/java/systests: junitvmwatcher3451231054183359611.properties src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
Date Thu, 28 Nov 2013 10:12:59 GMT
Author: kwall
Date: Thu Nov 28 10:12:59 2013
New Revision: 1546331

URL: http://svn.apache.org/r1546331
Log:
NO-JIRA:  [Java System Tests] Increase timeout factor used for failover timeout.  Test was
failing on a slow (virtualised) Jenkins environment.

Added:
    qpid/trunk/qpid/java/systests/junitvmwatcher3451231054183359611.properties
Modified:
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java

Added: qpid/trunk/qpid/java/systests/junitvmwatcher3451231054183359611.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/junitvmwatcher3451231054183359611.properties?rev=1546331&view=auto
==============================================================================
--- qpid/trunk/qpid/java/systests/junitvmwatcher3451231054183359611.properties (added)
+++ qpid/trunk/qpid/java/systests/junitvmwatcher3451231054183359611.properties Thu Nov 28
10:12:59 2013
@@ -0,0 +1 @@
+testHeartbeatsEnabledUsingOlderLegacySystemProperty

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java?rev=1546331&r1=1546330&r2=1546331&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
(original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
Thu Nov 28 10:12:59 2013
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.client.failover;
 
+import java.io.File;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -49,6 +50,8 @@ public class MultipleBrokersFailoverTest
     private static final String BROKER_PORTION_FORMAT = "tcp://localhost:%d?connectdelay='%d',retries='%d'";
     private static final int FAILOVER_RETRIES = 1;
     private static final int FAILOVER_CONNECTDELAY = 1000;
+    private static final int FAILOVER_FACTOR = 4;
+
     private int[] _brokerPorts;
     private AMQConnectionURL _connectionURL;
     private Connection _connection;
@@ -149,7 +152,7 @@ public class MultipleBrokersFailoverTest
                 if (_brokerPorts[i] > 0)
                 {
                     stopBrokerSafely(_brokerPorts[i]);
-                    FileUtils.deleteDirectory(System.getProperty("QPID_WORK") + "/" + getFailingPort());
+                    FileUtils.deleteDirectory(System.getProperty("QPID_WORK") + File.separator
+ getFailingPort());
                 }
             }
 
@@ -166,7 +169,7 @@ public class MultipleBrokersFailoverTest
 
         killBroker(_brokerPorts[1]);
 
-        awaitForFailoverCompletion(FAILOVER_CONNECTDELAY * _brokerPorts.length * 2);
+        awaitForFailoverCompletion(FAILOVER_CONNECTDELAY * _brokerPorts.length * FAILOVER_FACTOR);
         assertEquals("Failover is not started as expected", 0, _failoverStarted.getCount());
 
         assertSendReceive(2);
@@ -182,7 +185,7 @@ public class MultipleBrokersFailoverTest
 
         stopBroker(_brokerPorts[1]);
 
-        awaitForFailoverCompletion(FAILOVER_CONNECTDELAY * _brokerPorts.length * 2);
+        awaitForFailoverCompletion(FAILOVER_CONNECTDELAY * _brokerPorts.length * FAILOVER_FACTOR);
         assertEquals("Failover is not started as expected", 0, _failoverStarted.getCount());
 
         assertSendReceive(1);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message