Fix tests where OpenSSL path is invalid

This is the case for Buildbot where the version of OpenSSL (1.1.1f) is
too old.

Author: markt-asf

test/org/apache/tomcat/security/TestSecurity2017Ocsp.java

@@ -24,6 +24,7 @@
 
 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 static void stopOcspResponder() {
      */
     @Test(expected=SSLHandshakeException.class)
     public void testCVE_2017_15698() throws Exception {
+        Assume.assumeNotNull(ocspResponder);
 
         Tomcat tomcat = getTomcatInstance();
 

test/org/apache/tomcat/util/net/ocsp/TestOcspEnabled.java

@@ -25,6 +25,7 @@
 
 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 static Collection<Object[]> parameters() {
 
     @Test
     public void test() throws Exception {
+        Assume.assumeNotNull(ocspResponder);
         try {
             doTest(clientCertValid, serverCertValid, verifyClientCert, verifyServerCert);
             if (handshakeFailureExpected) {