Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ci disks seem to be really slow on force, increasing timeout and decreasing load on this test

This commit is contained in:
gtully 2015-06-17 14:21:18 +01:00
parent 471911466b
commit 6cf9a8a9a5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
View File

@ -364,7 +364,7 @@ public class AMQ2149Test {
verifyStats(false); verifyStats(false);
} }
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 10 * 60 * 1000)
public void testOrderWithRestart() throws Exception { public void testOrderWithRestart() throws Exception {
createBroker(new Configurer() { createBroker(new Configurer() {
public void configure(BrokerService broker) throws Exception { public void configure(BrokerService broker) throws Exception {
@ -387,7 +387,7 @@ public class AMQ2149Test {
verifyStats(true); verifyStats(true);
} }
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 10 * 60 * 1000)
public void testTopicOrderWithRestart() throws Exception { public void testTopicOrderWithRestart() throws Exception {
createBroker(new Configurer() { createBroker(new Configurer() {
public void configure(BrokerService broker) throws Exception { public void configure(BrokerService broker) throws Exception {
@ -407,18 +407,18 @@ public class AMQ2149Test {
verifyStats(true); verifyStats(true);
} }
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 10 * 60 * 1000)
public void testQueueTransactionalOrderWithRestart() throws Exception { public void testQueueTransactionalOrderWithRestart() throws Exception {
doTestTransactionalOrderWithRestart(ActiveMQDestination.QUEUE_TYPE); doTestTransactionalOrderWithRestart(ActiveMQDestination.QUEUE_TYPE);
} }
@Test(timeout = 5 * 60 * 1000) @Test(timeout = 10 * 60 * 1000)
public void testTopicTransactionalOrderWithRestart() throws Exception { public void testTopicTransactionalOrderWithRestart() throws Exception {
doTestTransactionalOrderWithRestart(ActiveMQDestination.TOPIC_TYPE); doTestTransactionalOrderWithRestart(ActiveMQDestination.TOPIC_TYPE);
} }
public void doTestTransactionalOrderWithRestart(byte destinationType) throws Exception { public void doTestTransactionalOrderWithRestart(byte destinationType) throws Exception {
numtoSend = 10000; numtoSend = 5000;
sleepBetweenSend = 3; sleepBetweenSend = 3;
brokerStopPeriod = 10 * 1000; brokerStopPeriod = 10 * 1000;
@ -519,10 +519,10 @@ public class AMQ2149Test {
threads.add(thread); threads.add(thread);
} }
final long expiry = System.currentTimeMillis() + 1000 * 60 * 4; final long expiry = System.currentTimeMillis() + 1000 * 60 * 10;
while(!threads.isEmpty() && exceptions.isEmpty() && System.currentTimeMillis() < expiry) { while(!threads.isEmpty() && exceptions.isEmpty() && System.currentTimeMillis() < expiry) {
Thread sendThread = threads.firstElement(); Thread sendThread = threads.firstElement();
sendThread.join(1000*30); sendThread.join(1000*60*10);
if (!sendThread.isAlive()) { if (!sendThread.isAlive()) {
threads.remove(sendThread); threads.remove(sendThread);
} else { } else {