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

(cherry picked from commit 2b2f672022547e8c19658213ac5a4090bf5b6c72)
This commit is contained in:
Inigo Goiri 2018-06-11 19:25:56 -07:00
parent df338f2e1a
commit 26ed145763
2 changed files with 3 additions and 3 deletions

View File

@ -150,9 +150,9 @@ public void testGetFullDirs() throws Exception {
Assert
.assertEquals(utilizationPerc, nm.getGoodLogDirsDiskUtilizationPerc());
Assert.assertEquals(localDir2,
Assert.assertEquals(new Path(localDir2).toString(),
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));
Assert.assertEquals(localDir1 + "," + localDir2,
dirSvc.getConfig().get(YarnConfiguration.NM_LOCAL_DIRS));

View File

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