From aee84166492c24ae9f3b0461be37fc4c253016f2 Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Wed, 4 Apr 2018 11:56:18 +0100 Subject: [PATCH] [ML][TEST] Disable other plugins for internal cluster integ tests (elastic/x-pack-elasticsearch#4285) ML internal cluster integration tests should not depend on any of the other plugins. In addition, monitoring can interfere with some of the tests, making them slower and more fragile. This reverts a change that got in elastic/x-pack-elasticsearch#3643. Relates elastic/x-pack-elasticsearch#4279 Original commit: elastic/x-pack-elasticsearch@340455c8482b9e5cad1385e486c9023b958d9077 --- .../xpack/ml/support/BaseMlIntegTestCase.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java b/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java index 1722e863261..7a554a51ea4 100644 --- a/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java +++ b/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java @@ -81,9 +81,9 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase { settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), true); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); settings.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial"); -// settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); -// settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); -// settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); + settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); + settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); + settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); return settings.build(); } @@ -92,9 +92,9 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase { Settings.Builder settings = Settings.builder().put(super.transportClientSettings()); settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), true); settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false); -// settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); -// settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); -// settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); + settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false); + settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false); + settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false); return settings.build(); }