Author: rjung Date: Sun Feb 3 10:32:00 2013 New Revision: 1441884 URL: http://svn.apache.org/viewvc?rev=1441884&view=rev Log: Widen accepted timeout return time in SocketServerTestSuite.
Modified: tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java Modified: tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java URL: http://svn.apache.org/viewvc/tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java?rev=1441884&r1=1441883&r2=1441884&view=diff ============================================================================== --- tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java (original) +++ tomcat/native/trunk/test/org/apache/tomcat/jni/SocketServerTestSuite.java Sun Feb 3 10:32:00 2013 @@ -79,7 +79,8 @@ public class SocketServerTestSuite exten while (Socket.recv(clientSock, buf, 0, 1) == 1) { } long wait = System.currentTimeMillis() - start; - if (wait < 1 || wait >3) { + /* allow some margin between set timeout and observed return time */ + if (wait < 1 || wait > 12) { Socket.close(clientSock); Socket.close(serverSock); throw new Exception("2 milliseconds client Socket.timeoutSet failed"); @@ -101,7 +102,8 @@ public class SocketServerTestSuite exten ok = true; } wait = System.currentTimeMillis() - start; - if (wait < 1 || wait >3 && ! ok) { + /* allow some margin between set timeout and observed return time */ + if (wait < 1 || wait > 12 && ! ok) { Socket.close(clientSock); Socket.close(serverSock); throw new Exception("2 milliseconds accept Socket.timeoutSet failed"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org