You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/01 01:09:31 UTC
[22/34] incubator-geode git commit: GEODE-870: Handling multiple
concurrent locator restarts. Elder locator nomination
GEODE-870: Handling multiple concurrent locator restarts. Elder locator nomination
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/594cf542
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/594cf542
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/594cf542
Branch: refs/heads/feature/GEODE-949-2
Commit: 594cf5428db0cb10899430b459fe5dec7f95235e
Parents: edc1c4c
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Feb 10 12:19:33 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon Feb 29 16:36:08 2016 +1100
----------------------------------------------------------------------
.../gemfire/distributed/LocatorDUnitTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/594cf542/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index c800acf..eb3cc62 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1434,8 +1434,8 @@ public class LocatorDUnitTest extends DistributedTestCase {
this.port1 = freeTCPPorts[0];
this.port2 = freeTCPPorts[1];
int port3 = freeTCPPorts[2];
- deleteLocatorStateFile(port1, port2, port3);
- final String host0 = getServerHostName(host);
+ DistributedTestUtils.deleteLocatorStateFile(port1, port2, port3);
+ final String host0 = NetworkUtils.getServerHostName(host);
final String locators = host0 + "[" + port1 + "]," +
host0 + "[" + port2 + "]," +
host0 + "[" + port3 + "]";
@@ -1488,7 +1488,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
+ Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
// three applications plus
assertEquals(6, system.getDM().getViewMembers().size());
@@ -1512,7 +1512,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
+ Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
final String newLocators = host0 + "[" + port2 + "]," +
host0 + "[" + port3 + "]";
@@ -1540,7 +1540,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
+ Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
int netviewId = vm1.invoke(() -> GMSJoinLeaveHelper.getViewId());
assertEquals(netviewId, (int) vm2.invoke(() -> GMSJoinLeaveHelper.getViewId()));
@@ -1573,7 +1573,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
try {
Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
} catch (IOException ex) {
- fail("While starting process on port " + args[0], ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
}
}
});
@@ -1586,7 +1586,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
try {
Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
} catch (IOException ex) {
- fail("While starting process on port " + args[0], ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
}
}
});