Author: cnauroth
Date: Wed Jun 12 19:06:08 2013
New Revision: 1492374
URL: http://svn.apache.org/r1492374
Log:
MAPREDUCE-5259. Merging change r1492367 from branch-2 to branch-2.1-beta.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1492374&r1=1492373&r2=1492374&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
Wed Jun 12 19:06:08 2013
@@ -371,6 +371,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.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java?rev=1492374&r1=1492373&r2=1492374&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskLog.java
Wed Jun 12 19:06:08 2013
@@ -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
