MAPREDUCE-7105. Fix TestNativeCollectorOnlyHandler.testOnCall on Windows because of the path format. Contributed by Giovanni Matteo Fumarola.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dad1bb86 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dad1bb86 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dad1bb86 Branch: refs/heads/YARN-1011 Commit: dad1bb868f7a28a486fd500f102c8c174e6dd272 Parents: e2c172d Author: Inigo Goiri <inigo...@apache.org> Authored: Mon Jun 4 12:55:54 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Mon Jun 4 12:55:54 2018 -0700 ---------------------------------------------------------------------- .../handlers/TestNativeCollectorOnlyHandler.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dad1bb86/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/handlers/TestNativeCollectorOnlyHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/handlers/TestNativeCollectorOnlyHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/handlers/TestNativeCollectorOnlyHandler.java index 1c8bf7a..314963b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/handlers/TestNativeCollectorOnlyHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/handlers/TestNativeCollectorOnlyHandler.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.mapred.nativetask.handlers; +import java.io.File; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -33,6 +34,7 @@ import org.apache.hadoop.mapred.nativetask.buffer.InputBuffer; import org.apache.hadoop.mapred.nativetask.testutil.TestConstants; import org.apache.hadoop.mapred.nativetask.util.OutputUtil; import org.apache.hadoop.mapred.nativetask.util.ReadWriteBuffer; +import org.apache.hadoop.util.StringUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -110,9 +112,12 @@ public class TestNativeCollectorOnlyHandler { } Assert.assertTrue("exception thrown", thrown); - final String expectedOutputPath = LOCAL_DIR + "/output/file.out"; - final String expectedOutputIndexPath = LOCAL_DIR + "/output/file.out.index"; - final String expectedSpillPath = LOCAL_DIR + "/output/spill0.out"; + final String expectedOutputPath = StringUtils.join(File.separator, + new String[] {LOCAL_DIR, "output", "file.out"}); + final String expectedOutputIndexPath = StringUtils.join(File.separator, + new String[] {LOCAL_DIR, "output", "file.out.index"}); + final String expectedSpillPath = StringUtils.join(File.separator, + new String[] {LOCAL_DIR, "output", "spill0.out"}); final String outputPath = handler.onCall( NativeCollectorOnlyHandler.GET_OUTPUT_PATH, null).readString(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
