Skip to content

Commit 81ac168

Browse files
committed
MAPREDUCE-5078. TestMRAppMaster fails on Windows due to mismatched path separators. (Contributed by Chris Nauroth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459544 13f79535-47bb-0310-9956-ffa450edef68
1 parent 585e490 commit 81ac168

File tree

2 files changed

+7
-2
lines changed
  • hadoop-mapreduce-project

2 files changed

+7
-2
lines changed

hadoop-mapreduce-project/CHANGES.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ Trunk (Unreleased)
158158

159159
MAPREDUCE-5012. Typo in javadoc for IdentityMapper class. (Adam Monsen
160160
via suresh)
161+
162+
MAPREDUCE-5078. TestMRAppMaster fails on Windows due to mismatched path
163+
separators. (Chris Nauroth via sseth)
161164

162165
BREAKDOWN OF HADOOP-8562 SUBTASKS
163166

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ public void testMRAppMasterForDifferentUser() throws IOException,
8484
YarnConfiguration conf = new YarnConfiguration();
8585
conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir);
8686
MRAppMaster.initAndStartAppMaster(appMaster, conf, userName);
87-
assertEquals(stagingDir + Path.SEPARATOR + userName + Path.SEPARATOR
88-
+ ".staging", appMaster.stagingDirPath.toString());
87+
Path userPath = new Path(stagingDir, userName);
88+
Path userStagingPath = new Path(userPath, ".staging");
89+
assertEquals(userStagingPath.toString(),
90+
appMaster.stagingDirPath.toString());
8991
}
9092

9193
@Test

0 commit comments

Comments
 (0)