summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/node
diff options
context:
space:
mode:
authorJason Tedor <jason@tedor.me>2016-05-19 14:08:08 -0400
committerJason Tedor <jason@tedor.me>2016-05-19 14:08:08 -0400
commitc257e2c51f235853c4453a86e10e463813140fc9 (patch)
tree30e62c0b4b9d1340c0f6e97286b1087b63e2d0a2 /core/src/test/java/org/elasticsearch/node
parent5da9e5dcbcd7676e09060ddb0a64d4328d959a64 (diff)
Remove settings and system properties entanglement
Today when parsing settings during bootstrap, we add a system property for every Elasticsearch setting. Additionally, settings can be set via system properties. This commit simplifies this situation. - settings are no longer propogated to system properties - system properties can not be used to set settings - the "es." prefix on settings is no longer required (nor permitted) - test logging has a dedicated system property (tests.logger.level) Relates #18198
Diffstat (limited to 'core/src/test/java/org/elasticsearch/node')
-rw-r--r--core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
index e1397ca47f..87abc20a0d 100644
--- a/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
+++ b/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
@@ -19,11 +19,6 @@
package org.elasticsearch.node.internal;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
import org.elasticsearch.cli.MockTerminal;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.common.settings.Settings;
@@ -33,6 +28,11 @@ import org.elasticsearch.test.ESTestCase;
import org.junit.After;
import org.junit.Before;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
@@ -134,7 +134,6 @@ public class InternalSettingsPreparerTests extends ESTestCase {
Files.createDirectory(config);
Files.copy(garbage, config.resolve("elasticsearch.yml"));
InternalSettingsPreparer.prepareEnvironment(Settings.builder()
- .put("config.ignore_system_properties", true)
.put(baseEnvSettings)
.build(), null);
} catch (SettingsException e) {
@@ -153,7 +152,6 @@ public class InternalSettingsPreparerTests extends ESTestCase {
try {
InternalSettingsPreparer.prepareEnvironment(Settings.builder()
- .put("config.ignore_system_properties", true)
.put(baseEnvSettings)
.build(), null);
} catch (SettingsException e) {