Remove max script compilation settings in tests

Some standalone tests set the max script compilation limit. However,
this setting is now set in the main cluster setup in core so it is no
longer needed here. This commit removes these obviated settings in
standalone tests.

Original commit: elastic/x-pack-elasticsearch@089328c8d7
This commit is contained in:
Jason Tedor 2017-08-01 14:56:33 +09:00
parent 7fecca6329
commit 5b1bf9a31e
3 changed files with 0 additions and 6 deletions

View File

@ -121,7 +121,6 @@ subprojects {
setting 'xpack.security.transport.ssl.enabled', 'true' setting 'xpack.security.transport.ssl.enabled', 'true'
setting 'xpack.ssl.keystore.path', 'testnode.jks' setting 'xpack.ssl.keystore.path', 'testnode.jks'
setting 'xpack.ssl.keystore.password', 'testnode' setting 'xpack.ssl.keystore.password', 'testnode'
setting 'script.max_compilations_per_minute', '20'
dependsOn copyTestNodeKeystore dependsOn copyTestNodeKeystore
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')
if (withSystemKey) { if (withSystemKey) {
@ -160,7 +159,6 @@ subprojects {
setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser' setupCommand 'setupTestUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'x-pack-test-password', '-r', 'superuser'
waitCondition = waitWithAuth waitCondition = waitWithAuth
setting 'xpack.ssl.keystore.path', 'testnode.jks' setting 'xpack.ssl.keystore.path', 'testnode.jks'
setting 'script.max_compilations_per_minute', '20'
keystoreSetting 'xpack.ssl.keystore.secure_password', 'testnode' keystoreSetting 'xpack.ssl.keystore.secure_password', 'testnode'
dependsOn copyTestNodeKeystore dependsOn copyTestNodeKeystore
extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks')

View File

@ -10,6 +10,4 @@ integTestCluster {
plugin ':x-pack-elasticsearch:plugin' plugin ':x-pack-elasticsearch:plugin'
setting 'xpack.security.enabled', 'false' setting 'xpack.security.enabled', 'false'
setting 'xpack.monitoring.enabled', 'false' setting 'xpack.monitoring.enabled', 'false'
// Need to allow more compilations per minute because of the integration tests
setting 'script.max_compilations_per_minute', '100'
} }

View File

@ -22,8 +22,6 @@ integTestCluster {
setting 'xpack.security.enabled', 'false' setting 'xpack.security.enabled', 'false'
setting 'xpack.monitoring.enabled', 'false' setting 'xpack.monitoring.enabled', 'false'
setting 'xpack.ml.enabled', 'false' setting 'xpack.ml.enabled', 'false'
// Need to allow more compilations per minute because of the integration tests
setting 'script.max_compilations_per_minute', '100'
// //
// JIRA integration test settings // JIRA integration test settings