From 4ca5519e9bd0d2c970e735624adf1033e4b4ab15 Mon Sep 17 00:00:00 2001 From: Kevin Earls Date: Thu, 20 Feb 2014 14:21:02 +0100 Subject: [PATCH] Reduced timeouts from 60 to 10 minutes to avoid long CI hangs --- .../activemq/leveldb/test/ElectingLevelDBStoreTest.java | 4 ++-- .../activemq/leveldb/test/MasterLevelDBStoreTest.java | 2 +- .../activemq/leveldb/test/ReplicatedLevelDBStoreTest.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) 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 c876f5150d..e8baf407d9 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 stores = new ArrayList(); @@ -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 stores = new ArrayList(); 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 d9a9793ba5..c53e6f23fa 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); 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 d9ba101b61..b84f0300a8 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 directories = new LinkedList(); @@ -189,7 +189,7 @@ public class ReplicatedLevelDBStoreTest { } } - @Test(timeout = 1000*60*60) + @Test(timeout = 1000*60*10) public void testSlowSlave() throws Exception { LinkedList directories = new LinkedList();