This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8443f734e32faba4930733afa12cf4682165f2ad Author: Mark Thomas <[email protected]> AuthorDate: Tue Jan 13 20:19:10 2026 +0000 Fix tests where OpenSSL path is invalid This is the case for Buildbot where the version of OpenSSL (1.1.1f) is too old. --- .../org/apache/tomcat/security/TestSecurity2017Ocsp.java | 16 ++++++++++++---- .../org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/test/org/apache/tomcat/security/TestSecurity2017Ocsp.java b/test/org/apache/tomcat/security/TestSecurity2017Ocsp.java index 516839dfec..3da985ae59 100644 --- a/test/org/apache/tomcat/security/TestSecurity2017Ocsp.java +++ b/test/org/apache/tomcat/security/TestSecurity2017Ocsp.java @@ -24,6 +24,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,16 +45,22 @@ public class TestSecurity2017Ocsp extends OcspBaseTest { private static TesterOcspResponder ocspResponder; @BeforeClass - public static void startOcspResponder() throws IOException { + public static void startOcspResponder() { ocspResponder = new TesterOcspResponder(); - ocspResponder.start(); + try { + ocspResponder.start(); + } catch (IOException ioe) { + ocspResponder = null; + } } @AfterClass public static void stopOcspResponder() { - ocspResponder.stop(); - ocspResponder = null; + if (ocspResponder != null) { + ocspResponder.stop(); + ocspResponder = null; + } } @@ -62,6 +69,7 @@ public class TestSecurity2017Ocsp extends OcspBaseTest { */ @Test(expected=SSLHandshakeException.class) public void testCVE_2017_15698() throws Exception { + Assume.assumeNotNull(ocspResponder); Tomcat tomcat = getTomcatInstance(); diff --git a/test/org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java b/test/org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java index ffc367e2da..e47d06eb38 100644 --- a/test/org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java +++ b/test/org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java @@ -25,6 +25,7 @@ import javax.net.ssl.SSLHandshakeException; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,16 +39,22 @@ public class TestOcspEnabled extends OcspBaseTest { private static TesterOcspResponder ocspResponder; @BeforeClass - public static void startOcspResponder() throws IOException { + public static void startOcspResponder() { ocspResponder = new TesterOcspResponder(); - ocspResponder.start(); + try { + ocspResponder.start(); + } catch (IOException ioe) { + ocspResponder = null; + } } @AfterClass public static void stopOcspResponder() { - ocspResponder.stop(); - ocspResponder = null; + if (ocspResponder != null) { + ocspResponder.stop(); + ocspResponder = null; + } } @@ -99,6 +106,7 @@ public class TestOcspEnabled extends OcspBaseTest { @Test public void test() throws Exception { + Assume.assumeNotNull(ocspResponder); try { doTest(clientCertValid, serverCertValid, verifyClientCert, verifyServerCert); if (handshakeFailureExpected) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
