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 7d29aa7 GEODE-6883
7d29aa7 is described below
commit 7d29aa741567010ee9e09122d21fdbe42c170ecb
Author: Bruce Schuchardt <[email protected]>
AuthorDate: Wed Aug 7 11:26:24 2019 -0700
GEODE-6883
fixing a unit test that was trying to delete a locator state file but was
doing so from the wrong directory. Moving the attempt into an invoke()
on the JVM that would consume the file if not deleted.
---
...ingUpgradeMultipleReceiversDefinedInClusterConfiguration.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeMultipleReceiversDefinedInClusterConfiguration.java
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeMultipleReceiversDefinedInClusterConfiguration.java
index d95a4cd..82cb8fc 100644
---
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeMultipleReceiversDefinedInClusterConfiguration.java
+++
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeMultipleReceiversDefinedInClusterConfiguration.java
@@ -144,12 +144,13 @@ public class
WANRollingUpgradeMultipleReceiversDefinedInClusterConfiguration
VM locator = Host.getHost(0).getVM(oldVersion, 0);
String hostName = NetworkUtils.getServerHostName();
final int locatorPort =
AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- DistributedTestUtils.deleteLocatorStateFile(locatorPort);
final String locators = hostName + "[" + locatorPort + "]";
-
// Start old locator
- locator.invoke(() -> startLocator(locatorPort, 0,
- locators, null, true));
+ locator.invoke(() -> {
+ DistributedTestUtils.deleteLocatorStateFile(locatorPort);
+ startLocator(locatorPort, 0,
+ locators, null, true);
+ });
// Wait for configuration configuration to be ready.
locator.invoke(
