This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch feature/GEODE-5363 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4dd085a0ceb1ce155aeecca25af7cc98ef41cd9c Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Mon Jul 9 22:43:38 2018 -0700 GEODE-5363: Run distributed tests from new sourceSet --- .../apache/geode/cache30/GlobalLockingDUnitTest.java | 2 +- .../geode/test/dunit/rules/DistributedTestRule.java | 2 -- gradle/test.gradle | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java index 69be5ee..667bc1c 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java @@ -46,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest; @Category({DistributedTest.class, DLockTest.class}) public class GlobalLockingDUnitTest extends JUnit4CacheTestCase { - public static Region region_testBug32356; + private static Region region_testBug32356; public GlobalLockingDUnitTest() { super(); diff --git a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java index c8af8a9..e01e1f3 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/test/dunit/rules/DistributedTestRule.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.apache.geode.cache.query.QueryTestUtils; import org.apache.geode.cache.query.internal.QueryObserverHolder; import org.apache.geode.cache30.ClientServerTestCase; -import org.apache.geode.cache30.GlobalLockingDUnitTest; import org.apache.geode.cache30.MultiVMRegionTestCase; import org.apache.geode.cache30.RegionTestCase; import org.apache.geode.distributed.internal.DistributionConfig; @@ -212,7 +211,6 @@ public class DistributedTestRule extends AbstractDistributedTestRule { DiskStoreObserver.setInstance(null); unregisterInstantiatorsInThisVM(); DistributionMessageObserver.setInstance(null); - GlobalLockingDUnitTest.region_testBug32356 = null; InitialImageOperation.slowImageProcessing = 0; InternalClientMembership.unregisterAllListeners(); LogWrapper.close(); diff --git a/gradle/test.gradle b/gradle/test.gradle index ea0192d..858b623 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -92,6 +92,15 @@ subprojects { } resources.srcDir file('src/integrationTest/resources') } + + distributedTest { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/distributedTest/java') + } + resources.srcDir file('src/distributedTest/resources') + } } task integrationTest(type:Test) { @@ -116,11 +125,21 @@ subprojects { } task distributedTest(type:Test) { + testClassesDirs = sourceSets.distributedTest.output.classesDirs + classpath = sourceSets.distributedTest.runtimeClasspath + useJUnit { includeCategories 'org.apache.geode.test.junit.categories.DistributedTest' excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest' } + forkEvery 1 + + if (project.hasProperty('maxParallelForks')) + maxParallelForks = project.maxParallelForks as int + if (project.hasProperty('forkEvery')) + forkEvery = project.forkEvery as int + outputs.upToDateWhen{false} }