This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/GEODE-5129 in repository https://gitbox.apache.org/repos/asf/geode.git
commit a7b973694b6d2158f0875d7ea2b458768ec039de Author: Udo Kohlmeyer <[email protected]> AuthorDate: Mon Apr 23 15:01:37 2018 -0700 GEODE-5129 Amend DistributedTestRule to honor the vmCount parameter when < 4 hosts --- .../geode/test/dunit/rules/AbstractDistributedTestRule.java | 2 +- .../org/apache/geode/test/dunit/rules/DistributedTestRule.java | 3 ++- .../org/apache/geode/test/dunit/standalone/DUnitLauncher.java | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java index fcba9c5..d5fde3b 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java @@ -67,7 +67,7 @@ class AbstractDistributedTestRule implements SerializableTestRule { } private void beforeDistributedTest() throws Throwable { - DUnitLauncher.launchIfNeeded(); + DUnitLauncher.launchIfNeeded(vmCount); beforeVmCount = getVMCount(); } diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java index 1b7394e..c8af8a9 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java @@ -111,12 +111,13 @@ public class DistributedTestRule extends AbstractDistributedTestRule { } DistributedTestRule(final Builder builder) { + super(builder.vmCount); vmCount = builder.vmCount; } @Override protected void before() throws Exception { - DUnitLauncher.launchIfNeeded(); + DUnitLauncher.launchIfNeeded(vmCount); for (int i = 0; i < vmCount; i++) { assertThat(getVM(i)).isNotNull(); } diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java index fa723d5..a61b609 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java @@ -98,7 +98,7 @@ public class DUnitLauncher { /** * Number of VMs to use during initialization. */ - public static final int NUM_VMS = 4; + public static int NUM_VMS = 4; /** * VM ID for the VM to use for the debugger. @@ -167,6 +167,14 @@ public class DUnitLauncher { } /** + * Launch DUnit. If the unit test was launched through the hydra framework, leave the test alone. + */ + public static void launchIfNeeded(int vmCount) { + NUM_VMS = vmCount; + launchIfNeeded(); + } + + /** * Test it see if the eclise dunit environment is launched. */ public static boolean isLaunched() { -- To stop receiving notification emails like this one, please contact [email protected].
