[geode] branch develop updated: GEODE-7016: Fix ServerStartupRedundancyRecoveryNotificationTest (#5718)

[kl...@apache.org]

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

klund 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 430debe  GEODE-7016: Fix ServerStartupRedundancyRecoveryNotificationTest (#5718)
430debe is described below

commit 430debe91d14d3bccec3772e9dd31dd79d3d4529
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Tue Nov 17 15:08:10 2020 -0800

    GEODE-7016: Fix ServerStartupRedundancyRecoveryNotificationTest (#5718)
    
    Use --disable-default-server to avoid one cause of BindExceptions.
---
 .../ServerStartupRedundancyRecoveryNotificationTest.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerStartupRedundancyRecoveryNotificationTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerStartupRedundancyRecoveryNotificationTest.java
index febad14..e801169 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerStartupRedundancyRecoveryNotificationTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/ServerStartupRedundancyRecoveryNotificationTest.java
@@ -15,6 +15,7 @@
 package org.apache.geode.launchers;
 
 import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPort;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,7 +34,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
-import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.test.junit.rules.gfsh.GfshRule;
 
 public class ServerStartupRedundancyRecoveryNotificationTest {
@@ -44,10 +44,8 @@ public class ServerStartupRedundancyRecoveryNotificationTest {
 
   @Rule
   public GfshRule gfshRule = new GfshRule();
-
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
   @Rule
   public TestName testName = new TestName();
 
@@ -62,10 +60,11 @@ public class ServerStartupRedundancyRecoveryNotificationTest {
   @Before
   public void redundantRegionThatRequiresRedundancyRecovery() throws IOException {
     locatorFolder = temporaryFolder.newFolder(LOCATOR_NAME).toPath().toAbsolutePath();
-    server1Folder = temporaryFolder.newFolder(SERVER_1_NAME).toPath().toAbsolutePath();
+    server1Folder = temporaryFolder.newFolder(SERVER_1_NAME + "_before").toPath()
+        .toAbsolutePath();
     server2Folder = temporaryFolder.newFolder(SERVER_2_NAME).toPath().toAbsolutePath();
 
-    locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
+    locatorPort = getRandomAvailableTCPPort();
 
     String startLocatorCommand = String.join(" ",
         "start locator",
@@ -133,12 +132,13 @@ public class ServerStartupRedundancyRecoveryNotificationTest {
   public void startupReportsOnlineOnlyAfterRedundancyRestored() throws IOException {
     String connectCommand = "connect --locator=localhost[" + locatorPort + "]";
     server1Folder =
-        temporaryFolder.newFolder(SERVER_1_NAME + "secondfolder").toPath().toAbsolutePath();
+        temporaryFolder.newFolder(SERVER_1_NAME + "_test").toPath().toAbsolutePath();
     startServer1Command = String.join(" ",
         "start server",
         "--name=" + SERVER_1_NAME,
         "--dir=" + server1Folder,
-        "--locators=localhost[" + locatorPort + "]");
+        "--locators=localhost[" + locatorPort + "]",
+        "--disable-default-server");
 
     gfshRule.execute(connectCommand, startServer1Command);