HDFS-13648. Fix TestGetConf#testGetJournalNodes on Windows due to a mismatch line separator. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit 8f83b9abf9a7462c50a1db18d4d99e80c535b09c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90060d52 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90060d52 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90060d52 Branch: refs/remotes/origin/branch-3.1 Commit: 90060d52f6a99ae2357ec617bf4038f2a4f95519 Parents: 8a9c2d7 Author: Inigo Goiri <inigo...@apache.org> Authored: Sat Jun 2 20:19:59 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Sat Jun 2 20:20:26 2018 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/90060d52/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java index 15c20b4..13fee1f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java @@ -388,7 +388,7 @@ public class TestGetConf { } buffer.append(val); } - buffer.append("\n"); + buffer.append(System.lineSeparator()); expected1 = buffer.toString(); Set<String> actual = DFSUtil.getJournalNodeAddresses(conf); @@ -462,7 +462,7 @@ public class TestGetConf { actual = DFSUtil.getJournalNodeAddresses(conf); assertEquals(expected.toString(), actual.toString()); - actual1 = "\n"; + actual1 = System.lineSeparator(); expected1 = getAddressListFromTool(TestType.JOURNALNODE, conf, true); assertEquals(expected1, actual1); @@ -479,7 +479,7 @@ public class TestGetConf { expected1 = getAddressListFromTool(TestType.JOURNALNODE, conf, true); - actual1 = "\n"; + actual1 = System.lineSeparator(); assertEquals(expected1, actual1); conf.clear(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
