This is an automated email from the ASF dual-hosted git repository.
onichols 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 07e8f64 GEODE-8252: Fix FixedPartitioningDUnitTest (#5580)
07e8f64 is described below
commit 07e8f64506d72ac46ceb14f649455907735725fd
Author: Kirk Lund <[email protected]>
AuthorDate: Wed Sep 30 15:16:01 2020 -0700
GEODE-8252: Fix FixedPartitioningDUnitTest (#5580)
Update FixedPartitioningDUnitTest after two PRs collided.
---
.../internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index 071a92f..90d3863 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -76,10 +76,10 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.rules.DistributedBlackboard;
import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
+import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
import org.apache.geode.test.dunit.rules.DistributedReference;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.DistributedRule;
-import org.apache.geode.test.dunit.rules.SharedErrorCollector;
import org.apache.geode.test.junit.categories.PartitioningTest;
/**
@@ -111,7 +111,7 @@ public class FixedPartitioningDUnitTest implements
Serializable {
@Rule
public DistributedRestoreSystemProperties restoreProps = new
DistributedRestoreSystemProperties();
@Rule
- public SharedErrorCollector errorCollector = new SharedErrorCollector();
+ public DistributedErrorCollector errorCollector = new
DistributedErrorCollector();
@Rule
public DistributedBlackboard blackboard = new DistributedBlackboard();