svn commit: r1823341 - /tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Tue Feb  6 14:34:54 2018
New Revision: 1823341

URL: http://svn.apache.org/viewvc?rev=1823341&view=rev
Log:
Back-port required constant

Modified:
    tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1823341&r1=1823340&r2=1823341&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java 
Tue Feb  6 14:34:54 2018
@@ -73,6 +73,7 @@ import org.apache.tomcat.websocket.CaseI
 public abstract class TomcatBaseTest extends LoggingBaseTest {
     private Tomcat tomcat;
     private boolean accessLogEnabled = false;
+    protected static final int DEFAULT_CLIENT_TIMEOUT_MS = 300_000;
 
     public static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
 
@@ -625,12 +626,12 @@ public abstract class TomcatBaseTest ext
 
     public static int headUrl(String path, ByteChunk out, Map<String, 
List<String>> resHead)
             throws IOException {
-        return methodUrl(path, out, 1000000, null, resHead, "HEAD");
+        return methodUrl(path, out, DEFAULT_CLIENT_TIMEOUT_MS, null, resHead, 
"HEAD");
     }
 
     public static int getUrl(String path, ByteChunk out, Map<String, 
List<String>> reqHead,
             Map<String, List<String>> resHead) throws IOException {
-        return getUrl(path, out, 1000000, reqHead, resHead);
+        return getUrl(path, out, DEFAULT_CLIENT_TIMEOUT_MS, reqHead, resHead);
     }
 
     public static int getUrl(String path, ByteChunk out, int readTimeout,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org