You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2018/04/24 18:01:31 UTC
[geode] branch feature/GEODE-5129 updated (25833bb -> 4f54820)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a change to branch feature/GEODE-5129
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 25833bb GEODE-5129 Amend DistributedTestRule to honor the vmCount parameter when < 4 hosts
new 4f54820 GEODE-5129 Amend DistributedTestRule to honor the vmCount parameter when < 4 hosts
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (25833bb)
\
N -- N -- N refs/heads/feature/GEODE-5129 (4f54820)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/geode/test/dunit/rules/DistributedTestRule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
udo@apache.org.
[geode] 01/01: GEODE-5129 Amend DistributedTestRule to honor the
vmCount parameter when < 4 hosts
Posted by ud...@apache.org.
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 4f54820bb8503254cbe1f593a0d9d43be499b1dd
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Mon Apr 23 15:01:37 2018 -0700
GEODE-5129 Amend DistributedTestRule to honor the vmCount parameter when < 4 hosts
---
.../org/apache/geode/test/dunit/rules/DistributedTestRule.java | 3 ++-
.../org/apache/geode/test/dunit/standalone/DUnitLauncher.java | 10 +++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
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
udo@apache.org.