This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c0630c9ab7c0aa794698cdd6f5187864702f8aee
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 3 19:45:15 2024 +0000
Test is skipped due to JSSE vs Apr, not renegotiation
Don't report a test as skipped if it can never pass
---
test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java | 9 +++++----
test/org/apache/tomcat/util/net/TesterSupport.java | 10 ----------
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index f2afd93806..1853a48f74 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -21,7 +21,6 @@ import java.net.SocketException;
import javax.net.ssl.SSLException;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.connector.Connector;
@@ -64,13 +63,15 @@ public class TestCustomSslTrustManager extends
TomcatBaseTest {
Tomcat tomcat = getTomcatInstance();
- Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
- TesterSupport.isRenegotiationSupported(tomcat));
-
TesterSupport.configureClientCertContext(tomcat);
Connector connector = tomcat.getConnector();
+ // This test is only for JSSE based SSL connectors
+ if (connector.getProtocolHandlerClassName().contains("Apr")) {
+ return;
+ }
+
// Override the defaults
ProtocolHandler handler = connector.getProtocolHandler();
if (handler instanceof AbstractHttp11JsseProtocol) {
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index c8c138cfc0..afbae25dc9 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -231,16 +231,6 @@ public final class TesterSupport {
return ks;
}
- public static boolean isRenegotiationSupported(Tomcat tomcat) {
- String protocol = tomcat.getConnector().getProtocolHandlerClassName();
- if (protocol.contains("Apr")) {
- // Disabled by default in 1.1.20 windows binary (2010-07-27)
- return false;
- }
-
- return true;
- }
-
protected static boolean isClientRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
