GEODE-2267: Enhance server/locator startup rules * be able to return the rule itself so that we can start the server/locator at rule declaration time. * rearrange the class structure * do not delete the workingDir if the rule is created with a workingDir (then it's up for the caller to delete it)
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d620e298 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d620e298 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d620e298 Branch: refs/heads/feature/GEODE-2420 Commit: d620e298d2d9e0961a75582825aca7e84984e6dd Parents: 2adaa9c Author: Jinmei Liao <jil...@pivotal.io> Authored: Thu Mar 2 15:58:18 2017 -0800 Committer: Ken Howe <kh...@pivotal.io> Committed: Mon Mar 27 14:00:13 2017 -0700 ---------------------------------------------------------------------- .../apache/geode/test/dunit/rules/GfshShellConnectionRule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/d620e298/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java index 3b1c99a..f367458 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java @@ -86,11 +86,11 @@ public class GfshShellConnectionRule extends DescribedExternalResource { } - public void connect(Member locator, String... options) throws Exception { + public void connect(MemberVM locator, String... options) throws Exception { connect(locator.getPort(), PortType.locator, options); } - public void connectAndVerify(Member locator, String... options) throws Exception { + public void connectAndVerify(MemberVM locator, String... options) throws Exception { connect(locator.getPort(), PortType.locator, options); assertThat(this.connected).isTrue(); }