This is an automated email from the ASF dual-hosted git repository.
jbarrett 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 0271f12 GEODE-5453: Isolates upgrade tests in upgradeTest source set.
(#2160)
0271f12 is described below
commit 0271f12583a3213ac2d2a1297d2f82599dd1052c
Author: Jacob Barrett <[email protected]>
AuthorDate: Tue Jul 24 11:36:30 2018 -0700
GEODE-5453: Isolates upgrade tests in upgradeTest source set. (#2160)
* DistributedTest task depends on UpgradeTest, until set in its own CI job
Co-authored-by: Robert Houghton <[email protected]>
Co-authored-by: Patrick Rhomberg <[email protected]>
---
geode-core/build.gradle | 4 ++++
.../cache/rollingupgrade/RollingUpgrade2DUnitTest.java | 3 ---
.../cache/rollingupgrade/RollingUpgradeDUnitTest.java | 3 ---
geode-cq/build.gradle | 2 ++
.../geode/security/ClientAuthorizationCQDUnitTest.java | 0
geode-lucene/build.gradle | 2 ++
.../lucene/LuceneSearchWithRollingUpgradeDUnit.java | 3 ---
...hWithRollingUpgradeReindexFlagEnabledDUnitTest.java | 0
geode-wan/build.gradle | 2 ++
.../geode/cache/wan/WANRollingUpgradeDUnitTest.java | 3 +--
gradle/docker.gradle | 1 +
gradle/test.gradle | 18 ++++++++++++++++--
12 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index b79c5c6..94a124c 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -31,6 +31,7 @@ idea {
testSourceDirs +=
project.tasks.generateIntegrationTestGrammarSource.outputs.files
testSourceDirs +=
project.tasks.generateDistributedTestGrammarSource.outputs.files
testSourceDirs +=
project.tasks.generatePerformanceTestGrammarSource.outputs.files
+ testSourceDirs +=
project.tasks.generateUpgradeTestGrammarSource.outputs.files
}
}
@@ -168,6 +169,9 @@ dependencies {
testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
testCompile project(':geode-concurrency-test')
+ distributedTestCompile files(sourceSets.integrationTest.output)
+ upgradeTestCompile files(sourceSets.distributedTest.output)
+ upgradeTestCompile files(sourceSets.integrationTest.output)
}
def generatedResources = "$buildDir/generated-resources/main"
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
similarity index 99%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
rename to
geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index b3ddeb6..0023a3f 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -42,7 +42,6 @@ import org.apache.commons.io.FileUtils;
import org.awaitility.Awaitility;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -106,7 +105,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
-import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -121,7 +119,6 @@ import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
*
* @author jhuynh
*/
-@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
similarity index 99%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
rename to
geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
index 126d5d8..8e4306d 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
+++
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.io.FileUtils;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -65,7 +64,6 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.VersionManager;
-import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
/**
@@ -84,7 +82,6 @@ import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
* @author jhuynh
*/
-@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 2d43329..69f22f0 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -28,4 +28,6 @@ dependencies {
integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
}
diff --git
a/geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
b/geode-cq/src/upgradeTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
similarity index 100%
rename from
geode-cq/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
rename to
geode-cq/src/upgradeTest/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 1594434..4f20cc3 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -43,6 +43,8 @@ dependencies {
integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
}
//The lucene integration tests don't have any issues that requiring forking
diff --git
a/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
similarity index 99%
rename from
geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
rename to
geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
index 5b3231f..7dde30f 100644
---
a/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
+++
b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java
@@ -34,7 +34,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -63,10 +62,8 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
-import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-@Category({BackwardCompatibilityTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class LuceneSearchWithRollingUpgradeDUnit extends
JUnit4DistributedTestCase {
diff --git
a/geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
b/geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
similarity index 100%
rename from
geode-lucene/src/distributedTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
rename to
geode-lucene/src/upgradeTest/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index bae19ef..ea3dcec 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -28,4 +28,6 @@ dependencies {
integrationTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
distributedTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.distributedTest.output)
+ upgradeTestCompile
files(project(':geode-core').sourceSets.integrationTest.output)
}
diff --git
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
similarity index 99%
rename from
geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
rename to
geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
index cb86554..831aa39 100644
---
a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
+++
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
@@ -68,13 +68,12 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
-import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@SuppressWarnings("ConstantConditions")
-@Category({BackwardCompatibilityTest.class, WanTest.class})
+@Category(WanTest.class)
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class WANRollingUpgradeDUnitTest extends JUnit4CacheTestCase {
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index 4cafbf2..c0f2815 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -108,6 +108,7 @@ subprojects {
if (project.hasProperty('parallelDunit')) {
distributedTest.configure(dockerConfig)
+ upgradeTest.configure(dockerConfig)
repeatTest.configure(dockerConfig)
}
}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index e940719..878215d 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -111,6 +111,11 @@ subprojects {
testTaskName = 'uiTest'
includeInCheckLifecycle = false
}
+ upgradeTest {
+ parentSourceSet = 'test'
+ testTaskName = 'upgradeTest'
+ includeInCheckLifecycle = false
+ }
}
integrationTest {
@@ -146,6 +151,8 @@ subprojects {
forkEvery 1
outputs.upToDateWhen{false}
+
+ dependsOn upgradeTest
}
acceptanceTest {
@@ -158,6 +165,11 @@ subprojects {
outputs.upToDateWhen{false}
}
+ upgradeTest {
+ forkEvery 1
+ outputs.upToDateWhen{false}
+ }
+
task repeatTest(type:RepeatTest) {
times= Integer.parseInt(repeat)
@@ -446,12 +458,14 @@ subprojects {
description 'Run this task before checking in code to validate changes.
This task combines the following tasks: build, integrationTest,
distributedTest, and flakyTest'
}
- combineReports.mustRunAfter check, test, integrationTest, distributedTest,
flakyTest, acceptanceTest, repeatTest
- [build, check, test, integrationTest, distributedTest, flakyTest,
acceptanceTest, repeatTest].each {it.finalizedBy combineReports}
+ combineReports.mustRunAfter check, test, integrationTest, distributedTest,
flakyTest, acceptanceTest, repeatTest, upgradeTest
+ [build, check, test, integrationTest, distributedTest, flakyTest,
acceptanceTest, repeatTest, upgradeTest].each {it.finalizedBy combineReports}
}
classes.dependsOn subprojects.compileIntegrationTestJava
classes.dependsOn subprojects.compileDistributedTestJava
classes.dependsOn subprojects.compileAcceptanceTestJava
classes.dependsOn subprojects.compileUiTestJava
+classes.dependsOn subprojects.compilePerformanceTestJava
+classes.dependsOn subprojects.compileUpgradeTestJava
