[geode] branch develop updated: GEODE-5456: Exceptions during SSL handshake are different for Windows (#2165)

[jensdeppe]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1662198  GEODE-5456: Exceptions during SSL handshake are different for 
Windows (#2165)
1662198 is described below

commit 166219892090c443f1d0fa8f998fab2ac9e12b82
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Thu Jul 19 20:41:06 2018 -0700

    GEODE-5456: Exceptions during SSL handshake are different for Windows 
(#2165)
---
 .../java/org/apache/geode/experimental/driver/SSLTest.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
 
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
index a10e0d6..5346cc0 100644
--- 
a/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
+++ 
b/geode-experimental-driver/src/integrationTest/java/org/apache/geode/experimental/driver/SSLTest.java
@@ -24,9 +24,12 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_A
 import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
 import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
 import static org.apache.geode.internal.Assert.assertTrue;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.net.SocketException;
 import java.util.Collections;
 import java.util.Properties;
 import java.util.Set;
@@ -140,7 +143,8 @@ public class SSLTest {
   public void driverCannotConnectWithBogusClientKeystore() throws Exception {
     startLocator(SERVER_KEY_STORE, true, "any", "any");
     startServer();
-    expectedException.expect(SSLException.class);
+    expectedException
+        .expect(anyOf(instanceOf(SSLException.class), 
instanceOf(SocketException.class)));
     driver = new DriverFactory().addLocator("localhost", locatorPort)
         
.setTrustStorePath(CLIENT_TRUST_STORE).setKeyStorePath(BOGUSCLIENT_KEY_STORE).create();
   }