Skip to content

Commit 69af822

Browse files
committed
[Rollup] Replace RollupIT with a ESRestTestCase version (elastic#31977)
The old RollupIT was a node IT, an flaky for a number of reasons. This new version is an ESRestTestCase and should be a little more robust. This was added to the multi-node QA tests as that seemed like the most appropriate location. It didn't seem necessary to create a whole new QA module. Note: The only test that was ported was the "Big" test for validating a larger dataset. The rest of the tests are represented in existing yaml tests. Closes elastic#31258 Closes elastic#30232 Related to elastic#30290
1 parent ac60fca commit 69af822

File tree

3 files changed

+326
-525
lines changed

3 files changed

+326
-525
lines changed

x-pack/plugin/rollup/build.gradle

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
2-
import org.elasticsearch.gradle.BuildPlugin
3-
41
evaluationDependsOn(xpackModule('core'))
52

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

26-
dependencyLicenses {
27-
ignoreSha 'x-pack-core'
28-
}
29-
3023
run {
3124
plugin xpackModule('core')
3225
}
3326

3427
integTest.enabled = false
35-
36-
37-
// Instead we create a separate task to run the
38-
// tests based on ESIntegTestCase
39-
task internalClusterTest(type: RandomizedTestingTask,
40-
group: JavaBasePlugin.VERIFICATION_GROUP,
41-
description: 'Multi-node tests',
42-
dependsOn: test.dependsOn) {
43-
configure(BuildPlugin.commonTestConfig(project))
44-
classpath = project.test.classpath
45-
testClassesDirs = project.test.testClassesDirs
46-
include '**/*IT.class'
47-
systemProperty 'es.set.netty.runtime.available.processors', 'false'
48-
}
49-
check.dependsOn internalClusterTest
50-
internalClusterTest.mustRunAfter test
51-
52-
// also add an "alias" task to make typing on the command line easier task icTest {
53-
task icTest {
54-
dependsOn internalClusterTest
55-
}

0 commit comments

Comments
 (0)