Author: dkulp
Date: Fri Apr 6 14:30:00 2012
New Revision: 1310346
URL: http://svn.apache.org/viewvc?rev=1310346&view=rev
Log:
Merged revisions 1310147 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1310147 | dkulp | 2012-04-05 21:28:55 -0400 (Thu, 05 Apr 2012) | 2 lines
Fix random failure with -T8 on my box
........
Modified:
cxf/branches/2.5.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.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=1310346&r1=1310345&r2=1310346&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:30:00 2012
@@ -259,7 +259,10 @@ public class ClientPersistenceTest exten
mf.verifyMessageNumbers(new String[] {"5"}, true);
mf.verifyAcknowledgements(new boolean[1], true);
- mf.verifyMessages(2, false);
+ // need in-exact as it COULD be 3 acks on a slow machine
+ //normally it will ack 1,3,5 and then 1-5, but on a slow machine,
+ //I've seen 1,3,5, then 1-3,5, and then 1-5
+ mf.verifyMessages(2, false, false);
// we can't reliably predict how the three remaining messages are
acknowledged
// expectedActions = new String[]
{RM10Constants.SEQUENCE_ACKNOWLEDGMENT_ACTION,
