Author: remm
Date: Tue Jul 21 14:51:22 2015
New Revision: 1692139
URL: http://svn.apache.org/r1692139
Log:
Skip maxConnections test, and unskip internal upgrade handler test.
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1692139&r1=1692138&r2=1692139&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestMaxConnections.java Tue
Jul 21 14:51:22 2015
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.core.StandardContext;
@@ -39,6 +40,8 @@ public class TestMaxConnections extends
@Test
public void testConnector() throws Exception {
init();
+ Assume.assumeFalse("This feature is not available for NIO2 (BZ58103)",
+
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
ConnectThread[] t = new ConnectThread[10];
for (int i=0; i<t.length; i++) {
t[i] = new ConnectThread();
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1692139&r1=1692138&r2=1692139&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Tue Jul 21 14:51:22 2015
@@ -60,8 +60,7 @@ public class TestUpgradeInternalHandler
public void testUpgradeInternal() throws Exception {
Assume.assumeTrue(
"Only supported on NIO 2",
- getTomcatInstance().getConnector().getProtocol()
-
.equals("org.apache.coyote.http11.Http11Nio2Protocol"));
+
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
UpgradeConnection uc = doUpgrade(EchoAsync.class);
PrintWriter pw = new PrintWriter(uc.getWriter());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
