Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13648. Fix TestGetConf#testGetJournalNodes on Windows due to a mismatch line separator. Contributed by Giovanni Matteo Fumarola. 

(cherry picked from commit 8f83b9abf9)
This commit is contained in:
Inigo Goiri 2018-06-02 20:19:59 -07:00
parent 8a9c2d7b97
commit 90060d52f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
View File

@ -388,7 +388,7 @@ public class TestGetConf {
} }
buffer.append(val); buffer.append(val);
} }
buffer.append("\n"); buffer.append(System.lineSeparator());
expected1 = buffer.toString(); expected1 = buffer.toString();
Set<String> actual = DFSUtil.getJournalNodeAddresses(conf); Set<String> actual = DFSUtil.getJournalNodeAddresses(conf);
@ -462,7 +462,7 @@ public class TestGetConf {
actual = DFSUtil.getJournalNodeAddresses(conf); actual = DFSUtil.getJournalNodeAddresses(conf);
assertEquals(expected.toString(), actual.toString()); assertEquals(expected.toString(), actual.toString());
actual1 = "\n"; actual1 = System.lineSeparator();
expected1 = getAddressListFromTool(TestType.JOURNALNODE, expected1 = getAddressListFromTool(TestType.JOURNALNODE,
conf, true); conf, true);
assertEquals(expected1, actual1); assertEquals(expected1, actual1);
@ -479,7 +479,7 @@ public class TestGetConf {
expected1 = getAddressListFromTool(TestType.JOURNALNODE, expected1 = getAddressListFromTool(TestType.JOURNALNODE,
conf, true); conf, true);
actual1 = "\n"; actual1 = System.lineSeparator();
assertEquals(expected1, actual1); assertEquals(expected1, actual1);
conf.clear(); conf.clear();
} }