Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-8370. Some Node Manager tests fail on Windows due to improper path/file separator. Contributed by Anbang Hu. 

(cherry picked from commit 2b2f672022)
This commit is contained in:
Inigo Goiri 2018-06-11 19:25:56 -07:00
parent baac7c2b28
commit 65d2554ad8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java
View File

@ -150,9 +150,9 @@ public class TestLocalDirsHandlerService {
Assert Assert
.assertEquals(utilizationPerc, nm.getGoodLogDirsDiskUtilizationPerc()); .assertEquals(utilizationPerc, nm.getGoodLogDirsDiskUtilizationPerc());
Assert.assertEquals(localDir2, Assert.assertEquals(new Path(localDir2).toString(),
dirSvc.getConfig().get(LocalDirsHandlerService.NM_GOOD_LOCAL_DIRS)); dirSvc.getConfig().get(LocalDirsHandlerService.NM_GOOD_LOCAL_DIRS));
Assert.assertEquals(logDir2, Assert.assertEquals(new Path(logDir2).toString(),
dirSvc.getConfig().get(LocalDirsHandlerService.NM_GOOD_LOG_DIRS)); dirSvc.getConfig().get(LocalDirsHandlerService.NM_GOOD_LOG_DIRS));
Assert.assertEquals(localDir1 + "," + localDir2, Assert.assertEquals(localDir1 + "," + localDir2,
dirSvc.getConfig().get(YarnConfiguration.NM_LOCAL_DIRS)); dirSvc.getConfig().get(YarnConfiguration.NM_LOCAL_DIRS));

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
View File

@ -316,7 +316,7 @@ public class TestAppLogAggregatorImpl {
for(int i = 0; i < tasks.length; i++) { for(int i = 0; i < tasks.length; i++) {
FileDeletionTask task = (FileDeletionTask) tasks[i]; FileDeletionTask task = (FileDeletionTask) tasks[i];
for (Path path: task.getBaseDirs()) { for (Path path: task.getBaseDirs()) {
paths.add(path.toUri().getRawPath()); paths.add(new File(path.toUri().getRawPath()).getAbsolutePath());
} }
} }
verifyFilesToDelete(expectedPathsForDeletion, paths); verifyFilesToDelete(expectedPathsForDeletion, paths);