MAPREDUCE-5259. Merging change r1492364 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492367 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -395,6 +395,9 @@ Release 2.1.0-beta - UNRELEASED
     MAPREDUCE-5315.  DistCp reports success even on failure. (mithun and jlowe
     via daryn)
 
+    MAPREDUCE-5259. TestTaskLog fails on Windows because of path separators
+    missmatch. (Ivan Mitic via cnauroth)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS
 
     MAPREDUCE-4739. Some MapReduce tests fail to find winutils.

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java

@@ -55,7 +55,8 @@ public class TestTaskLog {
     when(taid.toString()).thenReturn("JobId");
 
     File f = TaskLog.getTaskLogFile(taid, true, LogName.STDOUT);
-    assertTrue(f.getAbsolutePath().endsWith("testString/stdout"));
+    assertTrue(f.getAbsolutePath().endsWith("testString"
+        + File.separatorChar + "stdout"));
 
     // test getRealTaskLogFileLocation
 
@@ -69,11 +70,14 @@ public class TestTaskLog {
     TaskLog.syncLogs("location", taid, true);
 
     assertTrue(indexFile.getAbsolutePath().endsWith(
-        "userlogs/job_job_0001/JobId.cleanup/log.index"));
+        "userlogs" + File.separatorChar + "job_job_0001"
+        + File.separatorChar + "JobId.cleanup"
+        + File.separatorChar + "log.index"));
 
     f = TaskLog.getRealTaskLogFileLocation(taid, true, LogName.DEBUGOUT);
     if (f != null) {
-      assertTrue(f.getAbsolutePath().endsWith("location/debugout"));
+      assertTrue(f.getAbsolutePath().endsWith("location"
+          + File.separatorChar + "debugout"));
       FileUtils.copyFile(indexFile, f);
     }
     // test obtainLogDirOwner