You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/06 16:29:51 UTC
svn commit: r1310344 - in
/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm:
ClientPersistenceTest.java ServerPersistenceTest.java
Author: dkulp
Date: Fri Apr 6 14:29:51 2012
New Revision: 1310344
URL: http://svn.apache.org/viewvc?rev=1310344&view=rev
Log:
Merged revisions 1310070 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1310070 | dkulp | 2012-04-05 16:57:59 -0400 (Thu, 05 Apr 2012) | 3 lines
Adjust some timeouts to hopefully make parallel builds a bit more
reliable.
........
Modified:
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=1310344&r1=1310343&r2=1310344&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java Fri Apr 6 14:29:51 2012
@@ -311,7 +311,7 @@ public class ClientPersistenceTest exten
}
private void awaitMessages(int nExpectedOut, int nExpectedIn) {
- awaitMessages(nExpectedOut, nExpectedIn, 10000);
+ awaitMessages(nExpectedOut, nExpectedIn, 20000);
}
private void awaitMessages(int nExpectedOut, int nExpectedIn, int timeout) {
Modified: cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1310344&r1=1310343&r2=1310344&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Fri Apr 6 14:29:51 2012
@@ -170,8 +170,7 @@ public class ServerPersistenceTest exten
}
void verifyMissingResponse(Response<GreetMeResponse> responses[]) throws Exception {
- awaitMessages(5, 3, 20000);
-// awaitMessages(5, 8, 10000);
+ awaitMessages(5, 3, 25000);
int nDone = 0;
for (int i = 0; i < 3; i++) {
@@ -208,7 +207,7 @@ public class ServerPersistenceTest exten
// wait until all messages have received their responses
int nDone = 0;
long waited = 0;
- while (waited < 20) {
+ while (waited < 30) {
nDone = 0;
for (int i = 0; i < responses.length - 1; i++) {
if (responses[i].isDone()) {
@@ -257,7 +256,7 @@ public class ServerPersistenceTest exten
}
protected void awaitMessages(int nExpectedOut, int nExpectedIn) {
- awaitMessages(nExpectedOut, nExpectedIn, 10000);
+ awaitMessages(nExpectedOut, nExpectedIn, 20000);
}
private void awaitMessages(int nExpectedOut, int nExpectedIn, int timeout) {