Improve test reliability

Author: markt-asf

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

@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net.ocsp;
 
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -111,7 +112,7 @@ public void test() throws Exception {
             if (handshakeFailureExpected) {
                 Assert.fail("Handshake did not fail when expected to do so.");
             }
-        } catch (SSLHandshakeException e) {
+        } catch (SSLHandshakeException | SocketException e) {
             if (!handshakeFailureExpected) {
                 Assert.fail("Handshake failed when not expected to do so.");
             }

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

@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net.ocsp;
 
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -101,7 +102,7 @@ public void test() throws Exception {
             if (handshakeFailureExpected) {
                 Assert.fail("Handshake did not fail when expected to do so.");
             }
-        } catch (SSLHandshakeException e) {
+        } catch (SSLHandshakeException | SocketException e) {
             if (!handshakeFailureExpected) {
                 Assert.fail("Handshake failed when not expected to do so.");
             }

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

@@ -16,6 +16,7 @@
  */
 package org.apache.tomcat.util.net.ocsp;
 
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -101,7 +102,7 @@ public void test() throws Exception {
             if (handshakeFailureExpected) {
                 Assert.fail("Handshake did not fail when expected to do so.");
             }
-        } catch (SSLHandshakeException e) {
+        } catch (SSLHandshakeException | SocketException e) {
             if (!handshakeFailureExpected) {
                 Assert.fail("Handshake failed when not expected to do so.");
             }