You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2012/09/03 17:10:24 UTC
svn commit: r1380264 - in /activemq/trunk:
activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java
activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
pom.xml
Author: dejanb
Date: Mon Sep 3 15:10:23 2012
New Revision: 1380264
URL: http://svn.apache.org/viewvc?rev=1380264&view=rev
Log:
give tests a little bit more time, to check if it will help with occasional failures on slow machines
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java?rev=1380264&r1=1380263&r2=1380264&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsSendReceiveTestSupport.java Mon Sep 3 15:10:23 2012
@@ -169,7 +169,7 @@ public class JmsSendReceiveTestSupport e
* Waits for messages to be delivered.
*/
protected void waitForMessagesToBeDelivered() {
- long maxWaitTime = 30000;
+ long maxWaitTime = 60000;
long waitTime = maxWaitTime;
long start = (maxWaitTime <= 0) ? 0 : System.currentTimeMillis();
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java?rev=1380264&r1=1380263&r2=1380264&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java Mon Sep 3 15:10:23 2012
@@ -76,6 +76,7 @@ public abstract class DurableSubscriptio
broker.setPersistenceAdapter(createPersistenceAdapter());
broker.setPersistent(true);
broker.start();
+ broker.waitUntilStarted();
connection = createConnection();
}
@@ -87,6 +88,7 @@ public abstract class DurableSubscriptio
broker.setPersistenceAdapter(createPersistenceAdapter());
broker.setPersistent(true);
broker.start();
+ broker.waitUntilStarted();
connection = createConnection();
}
@@ -97,6 +99,7 @@ public abstract class DurableSubscriptio
}
if (broker != null) {
broker.stop();
+ broker.waitUntilStopped();
}
}
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1380264&r1=1380263&r2=1380264&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Sep 3 15:10:23 2012
@@ -70,7 +70,7 @@
<hsqldb-version>1.7.2.2</hsqldb-version>
<jasypt-version>1.8</jasypt-version>
<jdom-version>1.0</jdom-version>
- <jetty-version>7.6.1.v20120215</jetty-version>
+ <jetty-version>7.6.5.v20120716</jetty-version>
<jsp-version>2.1.v20100127</jsp-version>
<jstl-version>1.1.2</jstl-version>
<jettison-version>1.3.2</jettison-version>