Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Rollup] Replace RollupIT with a ESRestTestCase version #31977

Merged
merged 7 commits into from
Jul 16, 2018
Merged

[Rollup] Replace RollupIT with a ESRestTestCase version #31977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e4752a
[Rollup] Replace RollupIT with a ESRestTestCase version
polyfractal Jul 11, 2018
32ef176
Reduce page size to 20
polyfractal Jul 12, 2018
bb5c529
Hardcode the matchers to see if the build likes it better
polyfractal Jul 12, 2018
f7ff73b
Try to use `isOneOf` instead of `anyOf(equals())`
polyfractal Jul 13, 2018
e7c03fa
remove internalClusterTest details from build file
polyfractal Jul 13, 2018
0637040
Gradle tweak
polyfractal Jul 13, 2018
760355b
Merge remote-tracking branch 'origin/master' into rollup_replace_roll…
polyfractal Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions x-pack/plugin/rollup/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
import org.elasticsearch.gradle.BuildPlugin

evaluationDependsOn(xpackModule('core'))

apply plugin: 'elasticsearch.esplugin'
Expand All @@ -23,33 +20,8 @@ dependencies {
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
}

dependencyLicenses {
ignoreSha 'x-pack-core'
}

run {
plugin xpackModule('core')
}

integTest.enabled = false


// Instead we create a separate task to run the
// tests based on ESIntegTestCase
task internalClusterTest(type: RandomizedTestingTask,
group: JavaBasePlugin.VERIFICATION_GROUP,
description: 'Multi-node tests',
dependsOn: test.dependsOn) {
configure(BuildPlugin.commonTestConfig(project))
classpath = project.test.classpath
testClassesDirs = project.test.testClassesDirs
include '**/*IT.class'
systemProperty 'es.set.netty.runtime.available.processors', 'false'
}
check.dependsOn internalClusterTest
internalClusterTest.mustRunAfter test

// also add an "alias" task to make typing on the command line easier task icTest {
task icTest {
dependsOn internalClusterTest
}
Loading