Author: orudyy
Date: Thu Apr 23 12:50:53 2015
New Revision: 1675597
URL: http://svn.apache.org/r1675597
Log:
NO-JIRA: Make system test synchronous receive timeout configurable and increase
it on derby profiles in order to avoid sporadic test failures on slow boxes due
to elapsed timeout
Modified:
qpid/java/trunk/pom.xml
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Modified: qpid/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1675597&r1=1675596&r2=1675597&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Thu Apr 23 12:50:53 2015
@@ -71,6 +71,7 @@
<profile.broker.persistent>false</profile.broker.persistent>
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
+ <profile.test_receive_timeout>1000</profile.test_receive_timeout>
<dollar.sign>$</dollar.sign>
<at.sign>@</at.sign>
<bdb-version>5.0.104</bdb-version>
@@ -182,6 +183,7 @@
<echo>[profile.broker.persistent]
${profile.broker.persistent}</echo>
<echo>[profile.virtualhostnode.type]
${profile.virtualhostnode.type}</echo>
<echo>[profile.virtualhostnode.context.blueprint]
${profile.virtualhostnode.context.blueprint}</echo>
+ <echo>[profile.test_receive_timeout]
${profile.test_receive_timeout}</echo>
</target>
</configuration>
</execution>
@@ -250,6 +252,7 @@
<!-- This must be a child of qpid home currently due to the
horrible mechanics of QBTC -->
<test.output>${qpid.home.qbtc.output}</test.output>
<broker.clean.between.tests>true</broker.clean.between.tests>
+
<qpid.test_receive_timeout>${profile.test_receive_timeout}</qpid.test_receive_timeout>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -575,6 +578,7 @@
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
+ <profile.test_receive_timeout>2000</profile.test_receive_timeout>
</properties>
</profile>
@@ -594,6 +598,7 @@
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
+ <profile.test_receive_timeout>2000</profile.test_receive_timeout>
</properties>
</profile>
@@ -613,6 +618,7 @@
<profile.broker.persistent>true</profile.broker.persistent>
<profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore"}</profile.virtualhostnode.context.blueprint>
+ <profile.test_receive_timeout>2000</profile.test_receive_timeout>
</properties>
</profile>
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1675597&r1=1675596&r2=1675597&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Thu Apr 23 12:50:53 2015
@@ -91,7 +91,7 @@ public class QpidBrokerTestCase extends
protected static final Logger _logger =
Logger.getLogger(QpidBrokerTestCase.class);
protected static final int LOGMONITOR_TIMEOUT = 5000;
- protected long RECEIVE_TIMEOUT = 1000l;
+ protected long RECEIVE_TIMEOUT = Long.getLong("qpid.test_receive_timeout",
1000l);
private Map<String, String> _propertiesSetForBroker = new HashMap<String,
String>();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
