mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-21 20:35:54 +00:00
f709fcd083
This commit fixes several issues with the current implementation of starting & stopping watcher 1. The WatcherServiceResponse was always returning a message, that the request was acknowledged, completely independent from the fact if it was or not. 2. A new cluster state instance was always returned, regardless if the state had changed or not (which is explicitely mentioned in the javadocs to check for this) 3. The AckedClusterStateUpdateTask now returns a proper WatcherServiceResponse 4. A failure now gets logged Relates elastic/x-pack-elasticsearch#4225 (this is just a hunch for now) Original commit: elastic/x-pack-elasticsearch@f4c1749f95
47 lines
2.1 KiB
Groovy
47 lines
2.1 KiB
Groovy
apply plugin: 'elasticsearch.standalone-rest-test'
|
|
apply plugin: 'elasticsearch.rest-test'
|
|
|
|
dependencies {
|
|
testCompile project(path: xpackModule('core'), configuration: 'runtime')
|
|
}
|
|
|
|
// bring in watcher rest test suite
|
|
task copyWatcherRestTests(type: Copy) {
|
|
into project.sourceSets.test.output.resourcesDir
|
|
from project(xpackProject('plugin').path).sourceSets.test.resources.srcDirs
|
|
include 'rest-api-spec/test/watcher/**'
|
|
}
|
|
|
|
integTestCluster {
|
|
dependsOn copyWatcherRestTests
|
|
setting 'xpack.monitoring.enabled', 'false'
|
|
setting 'xpack.ml.enabled', 'false'
|
|
setting 'xpack.security.enabled', 'true'
|
|
// settings to test settings filtering on
|
|
setting 'xpack.notification.email.account._email.smtp.host', 'host.domain'
|
|
setting 'xpack.notification.email.account._email.smtp.port', '587'
|
|
setting 'xpack.notification.email.account._email.smtp.user', '_user'
|
|
setting 'xpack.notification.email.account._email.smtp.password', '_passwd'
|
|
setting 'xpack.license.self_generated.type', 'trial'
|
|
plugin xpackProject('plugin').path
|
|
extraConfigFile 'x-pack/roles.yml', 'roles.yml'
|
|
setupCommand 'setupTestAdminUser',
|
|
'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
|
|
setupCommand 'setupXpackUserForTests',
|
|
'bin/x-pack/users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
|
|
setupCommand 'setupWatcherManagerUser',
|
|
'bin/x-pack/users', 'useradd', 'watcher_manager', '-p', 'x-pack-test-password', '-r', 'watcher_manager'
|
|
setupCommand 'setupPowerlessUser',
|
|
'bin/x-pack/users', 'useradd', 'powerless_user', '-p', 'x-pack-test-password', '-r', 'crappy_role'
|
|
waitCondition = { node, ant ->
|
|
File tmpFile = new File(node.cwd, 'wait.success')
|
|
ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",
|
|
dest: tmpFile.toString(),
|
|
username: 'test_admin',
|
|
password: 'x-pack-test-password',
|
|
ignoreerrors: true,
|
|
retries: 10)
|
|
return tmpFile.exists()
|
|
}
|
|
}
|