Author: rupertlssmith
Date: Mon Oct 1 08:15:37 2007
New Revision: 580987
URL: http://svn.apache.org/viewvc?rev=580987&view=rev
Log:
Merged revisions 580985 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r580985 | rupertlssmith | 2007-10-01 16:11:14 +0100 (Mon, 01 Oct 2007) | 1
line
QPID-618, QPID-619, patch supplied by Aidan Skinner, test timeout increased.
........
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 1 08:15:37 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-580941
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-580941,580985
Modified:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java?rev=580987&r1=580986&r2=580987&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
(original)
+++
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
Mon Oct 1 08:15:37 2007
@@ -401,7 +401,7 @@
}
// Inject a short pause to allow time for exceptions to come back
asynchronously.
- TestUtils.pause(100L);
+ TestUtils.pause(500L);
// Request a status report.
check();