Build: Remove hack in shield+watcher rest test for copying config file

Original commit: elastic/x-pack-elasticsearch@e31ef685d0
This commit is contained in:
Ryan Ernst 2015-11-24 16:10:04 -08:00
parent 737f2e3b29
commit f96a6700c4
1 changed files with 2 additions and 3 deletions

View File

@ -12,9 +12,8 @@ task copyWatcherRestTests(type: Copy) {
include 'rest-api-spec/test/**'
}
integTest.dependsOn(copyWatcherRestTests)
integTest {
dependsOn copyWatcherRestTests
systemProperty 'tests.rest.blacklist',
['hijack/10_basic/*',
'array_compare_watch/10_basic/Basic array_compare watch'].join(',')
@ -23,7 +22,7 @@ integTest {
plugin 'license', project(':x-plugins:license:plugin')
plugin 'shield', project(':x-plugins:shield')
plugin 'watcher', project(':x-plugins:watcher')
extraConfigFile 'shield', 'roles.yml'
extraConfigFile 'shield/roles.yml', 'roles.yml'
setupCommand 'setupTestAdminUser',
'bin/shield/esusers', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'admin'
setupCommand 'setupWatcherManagerUser',