YARN-8370. Some Node Manager tests fail on Windows due to improper pa…

…th/file separator. Contributed by Anbang Hu. (cherry picked from commit 2b2f672)
justinuang · Jun 12, 2018 · d5f3a05 · d5f3a05
1 parent 8814154
commit d5f3a05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java b/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java
@@ -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));

diff --git a/...oop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java b/...oop/yarn/server/nodemanager/containermanager/logaggregation/TestAppLogAggregatorImpl.java
@@ -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);