activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kea...@apache.org
Subject git commit: Reduced timeouts from 60 to 10 minutes to avoid long CI hangs
Date Thu, 20 Feb 2014 13:21:16 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk f364b8a39 -> 4ca5519e9


Reduced timeouts from 60 to 10 minutes to avoid long CI hangs


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4ca5519e
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4ca5519e
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4ca5519e

Branch: refs/heads/trunk
Commit: 4ca5519e9bd0d2c970e735624adf1033e4b4ab15
Parents: f364b8a
Author: Kevin Earls <kevin@kevinearls.com>
Authored: Thu Feb 20 14:21:02 2014 +0100
Committer: Kevin Earls <kevin@kevinearls.com>
Committed: Thu Feb 20 14:21:02 2014 +0100

----------------------------------------------------------------------
 .../apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java | 4 ++--
 .../apache/activemq/leveldb/test/MasterLevelDBStoreTest.java   | 2 +-
 .../activemq/leveldb/test/ReplicatedLevelDBStoreTest.java      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4ca5519e/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java
b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java
index c876f51..e8baf40 100644
--- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java
+++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ElectingLevelDBStoreTest.java
@@ -39,7 +39,7 @@ public class ElectingLevelDBStoreTest extends ZooKeeperTestSupport {
 
     protected static final Logger LOG = LoggerFactory.getLogger(ElectingLevelDBStoreTest.class);
 
-    @Test(timeout = 1000*60*60)
+    @Test(timeout = 1000*60*10)
     public void testElection() throws Exception {
 
         ArrayList<ElectingLevelDBStore> stores = new ArrayList<ElectingLevelDBStore>();
@@ -131,7 +131,7 @@ public class ElectingLevelDBStoreTest extends ZooKeeperTestSupport {
         }
     }
 
-    @Test(timeout = 1000 * 60 * 60)
+    @Test(timeout = 1000 * 60 * 10)
     public void testZooKeeperServerFailure() throws Exception {
 
         final ArrayList<ElectingLevelDBStore> stores = new ArrayList<ElectingLevelDBStore>();

http://git-wip-us.apache.org/repos/asf/activemq/blob/4ca5519e/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/MasterLevelDBStoreTest.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/MasterLevelDBStoreTest.java
b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/MasterLevelDBStoreTest.java
index d9a9793..c53e6f2 100644
--- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/MasterLevelDBStoreTest.java
+++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/MasterLevelDBStoreTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
  */
 public class MasterLevelDBStoreTest {
 
-    @Test(timeout = 1000*60*60)
+    @Test(timeout = 1000*60*10)
     public void testStoppingStoreStopsTransport() throws Exception {
         final MasterLevelDBStore store = new MasterLevelDBStore();
         store.setReplicas(0);

http://git-wip-us.apache.org/repos/asf/activemq/blob/4ca5519e/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBStoreTest.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBStoreTest.java
b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBStoreTest.java
index d9ba101..b84f030 100644
--- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBStoreTest.java
+++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBStoreTest.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
 public class ReplicatedLevelDBStoreTest {
     protected static final Logger LOG = LoggerFactory.getLogger(ReplicatedLevelDBStoreTest.class);
 
-    @Test(timeout = 1000*60*60)
+    @Test(timeout = 1000*60*10)
     public void testMinReplicaEnforced() throws Exception {
 
         File masterDir = new File("target/activemq-data/leveldb-node1");
@@ -118,7 +118,7 @@ public class ReplicatedLevelDBStoreTest {
         return f;
     }
 
-    @Test(timeout = 1000*60*20)
+    @Test(timeout = 1000*60*10)
     public void testReplication() throws Exception {
 
         LinkedList<File> directories = new LinkedList<File>();
@@ -189,7 +189,7 @@ public class ReplicatedLevelDBStoreTest {
         }
     }
 
-    @Test(timeout = 1000*60*60)
+    @Test(timeout = 1000*60*10)
     public void testSlowSlave() throws Exception {
 
         LinkedList<File> directories = new LinkedList<File>();


Mime
View raw message