[geode] branch develop updated: GEODE-4981 CI failure: SSLConfigurationFactoryJUnitTest.getNonSSLConfiguration

[bs...@apache.org]

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

bschuchardt 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 4ba38c9  GEODE-4981 CI failure: SSLConfigurationFactoryJUnitTest.getNonSSLConfiguration
4ba38c9 is described below

commit 4ba38c9ab5df5b7c6a4620dd666c72a4ec138454
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Mon Apr 2 09:56:42 2018 -0700

    GEODE-4981 CI failure: SSLConfigurationFactoryJUnitTest.getNonSSLConfiguration
    
    Added SocketCreatorFactory.close() in @After methods to SSL tests that
    weren't cleaning up after themselves.
---
 .../apache/geode/cache/client/internal/LocatorSSLJUnitTest.java    | 7 +++++++
 .../org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java   | 7 +++++++
 .../test/java/org/apache/geode/internal/SSLConfigJUnitTest.java    | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
index a93edb3..ff8a170 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
@@ -25,10 +25,12 @@ import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTOR
 import java.io.IOException;
 import java.util.Properties;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.Locator;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.UnitTest;
 import org.apache.geode.util.test.TestUtil;
@@ -40,6 +42,11 @@ public class LocatorSSLJUnitTest {
   private final String SERVER_TRUST_STORE =
       TestUtil.getResourcePath(LocatorSSLJUnitTest.class, "cacheserver.truststore");
 
+  @After
+  public void tearDownTest() {
+    SSLConfigurationFactory.close();
+  }
+
   @Test
   public void canStopLocatorWithSSL() throws IOException {
     Properties properties = new Properties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
index b8c21b6..b919e79 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigIntegrationJUnitTest.java
@@ -17,11 +17,13 @@ package org.apache.geode.internal;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
 import org.apache.geode.management.GemFireProperties;
 import org.apache.geode.management.ManagementService;
 import org.apache.geode.management.MemberMXBean;
@@ -34,6 +36,11 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
 @Category(IntegrationTest.class)
 public class SSLConfigIntegrationJUnitTest {
 
+  @After
+  public void tearDownTest() {
+    SSLConfigurationFactory.close();
+  }
+
   @Test
   public void testIsClusterSSLRequireAuthentication() {
     Cache mCache = new CacheFactory().set(MCAST_PORT, "0").set(JMX_MANAGER, "true").create();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java
index 8904380..c308a90 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/SSLConfigJUnitTest.java
@@ -21,11 +21,13 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.internal.net.SSLConfigurationFactory;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
@@ -108,6 +110,11 @@ public class SSLConfigJUnitTest {
 
   }
 
+  @After
+  public void tearDownTest() {
+    SSLConfigurationFactory.close();
+  }
+
   @Test
   public void testMCastPortWithClusterSSL() throws Exception {
     Properties props = new Properties();

-- 
To stop receiving notification emails like this one, please contact
bschuchardt@apache.org.