Author: peter_firmstone Date: Sun Mar 17 12:53:49 2013 New Revision: 1457440
URL: http://svn.apache.org/r1457440 Log: Increased timout2 to give events more time to arrive for failing tests, appears to fix test failures. Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.java river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/javaspace.properties Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.java URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.java?rev=1457440&r1=1457439&r2=1457440&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.java (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/NotifyCounter.java Sun Mar 17 12:53:49 2013 @@ -57,7 +57,7 @@ public class NotifyCounter protected volatile long leaseTime; /** number of events */ - private volatile long maxEvNum; + private long maxEvNum; /** the proxy */ private final Object proxy; @@ -136,7 +136,7 @@ public class NotifyCounter * * @return Current event's number. */ - public long getEventsNum(EventRegistration reg) { + public synchronized long getEventsNum(EventRegistration reg) { return (maxEvNum - reg.getSequenceNumber()); } Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/javaspace.properties URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/javaspace.properties?rev=1457440&r1=1457439&r2=1457440&view=diff ============================================================================== --- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/javaspace.properties (original) +++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/test/spec/javaspace/conformance/javaspace.properties Sun Mar 17 12:53:49 2013 @@ -16,7 +16,7 @@ com.sun.jini.test.spec.javaspace.conform # timeout2 must be greater than (timeout1 + instantTime) # it is recommended that timeout2 be greater than (timeout1 + 2*instantTime) com.sun.jini.test.spec.javaspace.conformance.timeout1=20000 -com.sun.jini.test.spec.javaspace.conformance.timeout2=40000 +com.sun.jini.test.spec.javaspace.conformance.timeout2=45000 # general round trip time expected to non-blocking operations. # should be set to checkTime / 2.
