From 44c9bba39c53396867bd9e85e8e2c07ab4b220cd Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Mon, 17 Jul 2017 16:55:39 +0200 Subject: [PATCH] Remove `randomDynamicTemplates` usage. It has been removed it core. Original commit: elastic/x-pack-elasticsearch@ba9fd16ed65f054d4b140ca2b7e0f422e7bb594f --- .../org/elasticsearch/integration/FieldLevelSecurityTests.java | 2 +- .../java/org/elasticsearch/integration/IndexPrivilegeTests.java | 2 +- .../xpack/monitoring/collector/AbstractCollectorTestCase.java | 2 +- .../elasticsearch/xpack/watcher/WatcherPluginDisableTests.java | 2 +- .../xpack/watcher/test/AbstractWatcherIntegrationTestCase.java | 2 +- .../xpack/watcher/test/integration/SearchTransformTests.java | 2 +- .../xpack/watcher/transport/action/stats/WatchStatsTests.java | 2 +- .../xpack/watcher/transport/action/stats/WatcherStatsTests.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugin/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java b/plugin/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java index 2bb1e19978b..81416305994 100644 --- a/plugin/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java +++ b/plugin/src/test/java/org/elasticsearch/integration/FieldLevelSecurityTests.java @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; // The random usage of meta fields such as _timestamp add noise to the test, so disable random index templates: -@ESIntegTestCase.ClusterScope(randomDynamicTemplates = false) +@ESIntegTestCase.ClusterScope public class FieldLevelSecurityTests extends SecurityIntegTestCase { protected static final SecureString USERS_PASSWD = new SecureString("change_me".toCharArray()); diff --git a/plugin/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java b/plugin/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java index cf5e4087ffc..ce4f037a9f4 100644 --- a/plugin/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java +++ b/plugin/src/test/java/org/elasticsearch/integration/IndexPrivilegeTests.java @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.is; //test is just too slow, please fix it to not be sleep-based @BadApple(bugUrl = "https://github.com/elastic/x-plugins/issues/1007") -@ESIntegTestCase.ClusterScope(randomDynamicTemplates = false, maxNumDataNodes = 2) +@ESIntegTestCase.ClusterScope(maxNumDataNodes = 2) public class IndexPrivilegeTests extends AbstractPrivilegeTestCase { private String jsonDoc = "{ \"name\" : \"elasticsearch\", \"body\": \"foo bar\" }"; diff --git a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java index 4d691227333..81fef99f608 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/collector/AbstractCollectorTestCase.java @@ -16,7 +16,7 @@ import org.elasticsearch.xpack.monitoring.MonitoringSettings; import org.elasticsearch.xpack.monitoring.test.MonitoringIntegTestCase; import org.elasticsearch.xpack.security.InternalClient; -@ClusterScope(scope = ESIntegTestCase.Scope.SUITE, randomDynamicTemplates = false, transportClientRatio = 0.0) +@ClusterScope(scope = ESIntegTestCase.Scope.SUITE, transportClientRatio = 0.0) public abstract class AbstractCollectorTestCase extends MonitoringIntegTestCase { @Override diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java index 904cb51c1dd..6967423f12c 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherPluginDisableTests.java @@ -31,7 +31,7 @@ import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, maxNumDataNodes = 3) +@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, maxNumDataNodes = 3) public class WatcherPluginDisableTests extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index eb0b18f134a..b7b75e015cc 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -115,7 +115,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; -@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, maxNumDataNodes = 3) +@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, maxNumDataNodes = 3) public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase { public static final String WATCHER_LANG = Script.DEFAULT_SCRIPT_LANG; diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java index 70b67cbc8bf..fa43a0e9f01 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/integration/SearchTransformTests.java @@ -74,7 +74,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.joda.time.DateTimeZone.UTC; -@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, supportsDedicatedMasters = false, +@ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, supportsDedicatedMasters = false, numDataNodes = 1) public class SearchTransformTests extends ESIntegTestCase { diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatchStatsTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatchStatsTests.java index 5fdb72579e6..73445d26ca3 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatchStatsTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatchStatsTests.java @@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; @ESIntegTestCase.ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, - randomDynamicTemplates = false, numDataNodes = 1, supportsDedicatedMasters = false) + numDataNodes = 1, supportsDedicatedMasters = false) public class WatchStatsTests extends AbstractWatcherIntegrationTestCase { private static CountDownLatch scriptStartedLatch = new CountDownLatch(1); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java index 42d01e25807..d8bf07953bf 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transport/action/stats/WatcherStatsTests.java @@ -25,7 +25,7 @@ import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.cron; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; -@ClusterScope(scope = TEST, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false) +@ClusterScope(scope = TEST, numClientNodes = 0, transportClientRatio = 0) public class WatcherStatsTests extends AbstractWatcherIntegrationTestCase { @Override