honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Fix NodeEnvironmentTests on Windows - use Path.resolve instead of platform dependent path seperator

This commit is contained in:
Simon Willnauer 2016-06-08 21:40:35 +02:00
parent 06d26635de
commit 9497b704bb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java vendored
View File

@ -409,19 +409,19 @@ public class NodeEnvironmentTests extends ESTestCase {
public void testWhetherClusterFolderShouldBeUsed() throws Exception {
Path tempNoCluster = createTempDir();
String tempDataPathString = tempNoCluster.toAbsolutePath().toString();
Path tempDataPath = tempNoCluster.toAbsolutePath();
Path tempPath = tempNoCluster.resolve("foo"); // "foo" is the cluster name
String tempClusterPathString = tempPath.toAbsolutePath().toString();
Path tempClusterPath = tempPath.toAbsolutePath();
assertFalse("non-existent directory should not be used", NodeEnvironment.readFromDataPathWithClusterName(tempPath));
Settings settings = Settings.builder()
.put("cluster.name", "foo")
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toAbsolutePath().toString())
.put(Environment.PATH_DATA_SETTING.getKey(), tempDataPathString).build();
.put(Environment.PATH_DATA_SETTING.getKey(), tempDataPath.toString()).build();
try (NodeEnvironment env = new NodeEnvironment(settings, new Environment(settings))) {
Path nodeDataPath = env.nodeDataPaths()[0];
assertThat(nodeDataPath.toString(), equalTo(tempDataPathString + "/nodes/0"));
assertEquals(nodeDataPath, tempDataPath.resolve("nodes").resolve("0"));
}
IOUtils.rm(tempNoCluster);
@ -430,10 +430,10 @@ public class NodeEnvironmentTests extends ESTestCase {
settings = Settings.builder()
.put("cluster.name", "foo")
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toAbsolutePath().toString())
.put(Environment.PATH_DATA_SETTING.getKey(), tempDataPathString).build();
.put(Environment.PATH_DATA_SETTING.getKey(), tempDataPath.toString()).build();
try (NodeEnvironment env = new NodeEnvironment(settings, new Environment(settings))) {
Path nodeDataPath = env.nodeDataPaths()[0];
assertThat(nodeDataPath.toString(), equalTo(tempDataPathString + "/nodes/0"));
assertEquals(nodeDataPath, tempDataPath.resolve("nodes").resolve("0"));
}
IOUtils.rm(tempNoCluster);
@ -443,10 +443,10 @@ public class NodeEnvironmentTests extends ESTestCase {
settings = Settings.builder()
.put("cluster.name", "foo")
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toAbsolutePath().toString())
.put(Environment.PATH_DATA_SETTING.getKey(), tempDataPathString).build();
.put(Environment.PATH_DATA_SETTING.getKey(), tempClusterPath.toString()).build();
try (NodeEnvironment env = new NodeEnvironment(settings, new Environment(settings))) {
Path nodeDataPath = env.nodeDataPaths()[0];
assertThat(nodeDataPath.toString(), equalTo(tempClusterPathString + "/nodes/0"));
assertEquals(nodeDataPath, tempClusterPath.resolve("nodes").resolve("0"));
}
}