You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/08/01 21:03:02 UTC

[08/50] [abbrv] geode git commit: GEODE-3296: Speed up Acceptance Tests

GEODE-3296: Speed up Acceptance Tests


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b8891128
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b8891128
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b8891128

Branch: refs/heads/feature/GEODE-3299
Commit: b8891128959df5e5a5621f4567a9d4f43b9b1647
Parents: 289a085
Author: Jared Stewart <js...@pivotal.io>
Authored: Tue Jul 25 09:53:28 2017 -0700
Committer: Jared Stewart <js...@pivotal.io>
Committed: Wed Jul 26 09:04:06 2017 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle |  8 ++++++++
 gradle/test.gradle          | 13 +++----------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/b8891128/geode-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 69f1f19..a76afdc 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -104,6 +104,14 @@ sourceSets {
   //test.runtimeClasspath -= configurations.provided
 }
 
+task acceptanceTest(type:Test) {
+  useJUnit {
+    includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
+  }
+  forkEvery 1
+}
+
+
 test {
   // test from the actual classpath not the gradle classpath
   dependsOn installDist

http://git-wip-us.apache.org/repos/asf/geode/blob/b8891128/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 741c64e..1b92a52 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -124,13 +124,6 @@ subprojects {
     reports.junitXml.destination = file "$buildDir/test-reports-flaky"
   }
 
-  task acceptanceTest(type:Test) {
-    useJUnit {
-      includeCategories 'org.apache.geode.test.junit.categories.AcceptanceTest'
-    }
-    forkEvery 1
-  }
-
   task securityTest(type:Test) {
     useJUnit {
       includeCategories 'org.apache.geode.test.junit.categories.SecurityTest'
@@ -272,7 +265,7 @@ subprojects {
           def now = new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
           progress << "$now Completed test $desc.className $desc.name with result: ${result.resultType}$eol"
         }
-        
+
         doFirst {
           resultsDir.deleteDir()
           resultsDir.mkdirs()
@@ -282,12 +275,12 @@ subprojects {
   })
 
   // Make precheckin task run all validation tests for checking in code.
-  task precheckin (dependsOn: [ build, acceptanceTest, integrationTest, distributedTest, flakyTest ]) {
+  task precheckin (dependsOn: [ build, ":geode-assembly:acceptanceTest", integrationTest, distributedTest, flakyTest ]) {
     description 'Run this task before checking in code to validate changes. This task combines the following tasks: build, integrationTest, distributedTest, and flakyTest'
   }
 
   check.dependsOn checkMissedTests
 
-  combineReports.mustRunAfter check, test, acceptanceTest, integrationTest, distributedTest, flakyTest, checkMissedTests
+  combineReports.mustRunAfter check, test, ":geode-assembly:acceptanceTest", integrationTest, distributedTest, flakyTest, checkMissedTests
   [build, check, test, integrationTest, distributedTest, flakyTest, checkMissedTests].each {it.finalizedBy combineReports}
 }