Author: markt
Date: Tue Jan 31 11:25:57 2017
New Revision: 1781059
URL: http://svn.apache.org/viewvc?rev=1781059&view=rev
Log:
Increase timeout. Windows doesn't seem to handle very short timeouts
Modified:
tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
Modified: tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java?rev=1781059&r1=1781058&r2=1781059&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/jni/TestSocketServer.java Tue Jan 31
11:25:57 2017
@@ -99,18 +99,18 @@ public class TestSocketServer {
/* Accept the client connection */
clientSocket = Socket.accept(serverSocket);
- /* Configure a 2ms timeout for reading from client */
- Socket.timeoutSet(clientSocket, 2000);
+ /* Configure a 1s timeout for reading from client */
+ Socket.timeoutSet(clientSocket, 1000000);
long timeout = Socket.timeoutGet(clientSocket);
- Assert.assertEquals("Socket.timeoutGet clientSocket failed", 2000,
timeout);
+ Assert.assertEquals("Socket.timeoutGet clientSocket failed", 1000000,
timeout);
byte [] buf = new byte[1];
long start = System.nanoTime();
while (Socket.recv(clientSocket, buf, 0, 1) == 1) {
}
long wait = System.nanoTime() - start;
- Assert.assertFalse("Socket.timeoutSet failed (<1.5ms)", wait <
1500000);
- Assert.assertFalse("Socket.timeoutSet failed (>5.0ms)", wait >
5000000);
+ Assert.assertFalse("Socket.timeoutSet failed (<1s) [" + wait + "]",
wait < 1000000000);
+ Assert.assertFalse("Socket.timeoutSet failed (>2s) [" + wait + "]",
wait > 2000000000);
client.countDown();
client.join();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
