You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/05/29 15:32:29 UTC
svn commit: r1832455 -
/tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
Author: markt
Date: Tue May 29 15:32:29 2018
New Revision: 1832455
URL: http://svn.apache.org/viewvc?rev=1832455&view=rev
Log:
Make test more robust. It now passes when running on Java 8 and Java 11.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1832455&r1=1832454&r2=1832455&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java Tue May 29 15:32:29 2018
@@ -40,6 +40,7 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -228,7 +229,7 @@ public class TestSwallowAbortedUploads e
private static final String URI = "/uploadAborted";
private static final String servletName = "uploadAborted";
private static final int limitSize = 100;
- private static final int hugeSize = 2000000;
+ private static final int hugeSize = 10000000;
private Context context;
@@ -252,8 +253,12 @@ public class TestSwallowAbortedUploads e
context.addServletMappingDecoded(URI, servletName);
context.setSwallowAbortedUploads(swallow);
+ Connector c = tomcat.getConnector();
+ c.setMaxPostSize(2 * hugeSize);
+ c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+
tomcat.start();
- setPort(tomcat.getConnector().getLocalPort());
+ setPort(c.getLocalPort());
}
private Exception doRequest(boolean limited, boolean swallow) {
@@ -344,7 +349,7 @@ public class TestSwallowAbortedUploads e
private static final String URI = "/uploadAborted";
private static final String servletName = "uploadAborted";
- private static final int hugeSize = 2000000;
+ private static final int hugeSize = 10000000;
private Context context;
@@ -360,7 +365,11 @@ public class TestSwallowAbortedUploads e
tomcat.start();
- setPort(tomcat.getConnector().getLocalPort());
+ Connector c = tomcat.getConnector();
+ c.setMaxPostSize(2 * hugeSize);
+ c.setProperty("maxSwallowSize", Integer.toString(hugeSize));
+
+ setPort(c.getLocalPort());
}
private Exception doRequest(int status, boolean swallow) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org