Prechádzať zdrojové kódy

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

Inigo Goiri 6 rokov pred
rodič
commit
2b2f672022

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java

@@ -150,9 +150,9 @@ public class TestLocalDirsHandlerService {
     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));

+ 1 - 1
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

@@ -324,7 +324,7 @@ public class TestAppLogAggregatorImpl {
           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);