Skip to content

Commit a138fa6

Browse files
committed
Splitting functional tests into separate Gradle tasks
The hope is that when these run in the regression, the fast ones will all succeed and won't be affected by the results of the slow ones, which will run after the fast ones. Also added another call to mlDeploy before running the functional tests to ensure that the expected test app is present.
1 parent 1294ccb commit a138fa6

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

Jenkinsfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ def runtests(String type, String version){
3333
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
3434
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
3535
cd java-client-api
36-
./gradlew marklogic-client-api-functionaltests:test || true
36+
./gradlew mlDeploy
37+
./gradlew marklogic-client-api-functionaltests:testFastFunctionalTests || true
38+
./gradlew marklogic-client-api-functionaltests:testSlowFunctionalTests || true
3739
'''
3840
sh label:'post-test-process', script: '''
3941
cd $WORKSPACE/java-client-api/marklogic-client-api/build/test-results/test/
@@ -81,6 +83,7 @@ pipeline{
8183
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
8284
cd java-client-api
8385
./gradlew marklogic-client-api:test || true
86+
./gradlew marklogic-client-api-functionaltests:testFastFunctionalTests || true
8487
'''
8588
sh label:'ml development tool test', script: '''#!/bin/bash
8689
export JAVA_HOME=$JAVA_HOME_DIR

marklogic-client-api-functionaltests/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,14 @@ dependencies {
3535

3636
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.11'
3737
}
38+
39+
task testFastFunctionalTests(type: Test) {
40+
description = "Run all fast functional tests that don't setup/teardown custom app servers / databases"
41+
include "com/marklogic/client/fastfunctest/**"
42+
}
43+
44+
task testSlowFunctionalTests(type: Test) {
45+
description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases"
46+
include "com/marklogic/client/datamovement/functionaltests/**"
47+
include "com/marklogic/client/functionaltest/**"
48+
}

0 commit comments

Comments
 (0)