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

This commit is contained in:
Kevin Earls 2014-02-20 14:21:02 +01:00
parent f364b8a391
commit 4ca5519e9b
3 changed files with 6 additions and 6 deletions

View File

@ -39,7 +39,7 @@ public class ElectingLevelDBStoreTest extends ZooKeeperTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(ElectingLevelDBStoreTest.class); protected static final Logger LOG = LoggerFactory.getLogger(ElectingLevelDBStoreTest.class);
@Test(timeout = 1000*60*60) @Test(timeout = 1000*60*10)
public void testElection() throws Exception { public void testElection() throws Exception {
ArrayList<ElectingLevelDBStore> stores = new ArrayList<ElectingLevelDBStore>(); 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 { public void testZooKeeperServerFailure() throws Exception {
final ArrayList<ElectingLevelDBStore> stores = new ArrayList<ElectingLevelDBStore>(); final ArrayList<ElectingLevelDBStore> stores = new ArrayList<ElectingLevelDBStore>();

View File

@ -34,7 +34,7 @@ import static org.junit.Assert.*;
*/ */
public class MasterLevelDBStoreTest { public class MasterLevelDBStoreTest {
@Test(timeout = 1000*60*60) @Test(timeout = 1000*60*10)
public void testStoppingStoreStopsTransport() throws Exception { public void testStoppingStoreStopsTransport() throws Exception {
final MasterLevelDBStore store = new MasterLevelDBStore(); final MasterLevelDBStore store = new MasterLevelDBStore();
store.setReplicas(0); store.setReplicas(0);

View File

@ -44,7 +44,7 @@ import static org.junit.Assert.*;
public class ReplicatedLevelDBStoreTest { public class ReplicatedLevelDBStoreTest {
protected static final Logger LOG = LoggerFactory.getLogger(ReplicatedLevelDBStoreTest.class); protected static final Logger LOG = LoggerFactory.getLogger(ReplicatedLevelDBStoreTest.class);
@Test(timeout = 1000*60*60) @Test(timeout = 1000*60*10)
public void testMinReplicaEnforced() throws Exception { public void testMinReplicaEnforced() throws Exception {
File masterDir = new File("target/activemq-data/leveldb-node1"); File masterDir = new File("target/activemq-data/leveldb-node1");
@ -118,7 +118,7 @@ public class ReplicatedLevelDBStoreTest {
return f; return f;
} }
@Test(timeout = 1000*60*20) @Test(timeout = 1000*60*10)
public void testReplication() throws Exception { public void testReplication() throws Exception {
LinkedList<File> directories = new LinkedList<File>(); 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 { public void testSlowSlave() throws Exception {
LinkedList<File> directories = new LinkedList<File>(); LinkedList<File> directories = new LinkedList<File>();