This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 354f56d6fa798b37afb08d9ee9d54f30793660e8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 4 11:45:32 2024 +0000
Test is no longer limited to NIO2
---
.../apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
index e565e542b2..8562803344 100644
--- a/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
+++ b/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
@@ -39,7 +39,6 @@ import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.WebConnection;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
@@ -59,10 +58,6 @@ public class TestUpgradeInternalHandler extends
TomcatBaseTest {
@Test
public void testUpgradeInternal() throws Exception {
- Assume.assumeTrue(
- "Only supported on NIO 2",
-
getTomcatInstance().getConnector().getProtocolHandlerClassName().contains("Nio2"));
-
UpgradeConnection uc = doUpgrade(EchoAsync.class);
PrintWriter pw = new PrintWriter(uc.getWriter());
BufferedReader reader = uc.getReader();
@@ -87,6 +82,7 @@ public class TestUpgradeInternalHandler extends
TomcatBaseTest {
Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws
Exception {
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
+ Assert.assertTrue(tomcat.getConnector().setProperty("useAsyncIO",
"true"));
// No file system docBase required
Context ctx = getProgrammaticRootContext();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
