geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject geode git commit: Fix SecurityClusterConfigDUnitTest
Date Thu, 15 Jun 2017 21:35:02 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3062-2 23563dc00 -> 77eed82a3


Fix SecurityClusterConfigDUnitTest


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/77eed82a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/77eed82a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/77eed82a

Branch: refs/heads/feature/GEODE-3062-2
Commit: 77eed82a3259034bf78416d881b240a3ec1afcea
Parents: 23563dc
Author: Kirk Lund <klund@apache.org>
Authored: Thu Jun 15 14:34:48 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Thu Jun 15 14:34:48 2017 -0700

----------------------------------------------------------------------
 .../geode/security/SecurityClusterConfigDUnitTest.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/77eed82a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index d913893..7193f17 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -21,6 +21,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANA
 import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
 import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
 import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
+import static org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase.disconnectAllFromDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -31,6 +32,7 @@ import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
 import org.apache.geode.test.dunit.rules.ServerStarterRule;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -49,6 +51,8 @@ public class SecurityClusterConfigDUnitTest {
 
   @Before
   public void before() throws Exception {
+    disconnectAllFromDS();
+
     addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toString());
     addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toString());
 
@@ -62,6 +66,11 @@ public class SecurityClusterConfigDUnitTest {
     this.lsRule.startLocatorVM(0, props);
   }
 
+  @After
+  public void after() {
+    disconnectAllFromDS();
+  }
+
   @Test
   public void testStartServerWithClusterConfig() throws Exception {
     Properties props = new Properties();
@@ -139,8 +148,6 @@ public class SecurityClusterConfigDUnitTest {
         () -> this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort()))
             .isInstanceOf(GemFireConfigException.class).hasMessage(
                 LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
-
-    // this.serverStarter.startServer(props, this.lsRule.getMember(0).getPort());
   }
 
   @Test


Mime
View raw message