Fix breakage of distribution integ tests

This commit is contained in:
Ryan Ernst 2015-12-10 19:05:47 -08:00
parent e29c9b9dfd
commit 634c39ccfd
5 changed files with 5 additions and 5 deletions

View File

@ -95,11 +95,11 @@ subprojects {
apply plugin: 'elasticsearch.rest-test'
project.integTest {
dependsOn project.assemble
includePackaged project.name == 'integ-test-zip'
cluster {
distribution = project.name
}
if (project.name != 'integ-test-zip') {
includePackaged true
// see note above with module mustRunAfter about why integTest#stop is used here
mustRunAfter ':distribution:integ-test-zip:integTest#stop'
}

View File

@ -10,4 +10,4 @@
- do:
nodes.info: {}
- length: { nodes.$master.plugins: ${expected.modules.count} }
- length: { nodes.$master.modules: ${expected.modules.count} }

View File

@ -10,4 +10,4 @@
- do:
nodes.info: {}
- length: { nodes.$master.plugins: ${expected.modules.count} }
- length: { nodes.$master.modules: ${expected.modules.count} }

View File

@ -10,4 +10,4 @@
- do:
nodes.info: {}
- length: { nodes.$master.plugins: ${expected.modules.count} }
- length: { nodes.$master.modules: ${expected.modules.count} }

View File

@ -10,4 +10,4 @@
- do:
nodes.info: {}
- length: { nodes.$master.plugins: ${expected.modules.count} }
- length: { nodes.$master.modules: ${expected.modules.count} }