diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java index e704c8fe36b..449eebc5a3f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java +++ b/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 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/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java index c5b2e9711c4..2250f830015 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java @@ -98,7 +98,8 @@ public void testExecutorPath() { String yarnHomeEnvVar = System.getenv("HADOOP_YARN_HOME"); String yarnHome = yarnHomeEnvVar != null ? yarnHomeEnvVar : new File("").getAbsolutePath(); - String expectedPath = yarnHome + "/bin/container-executor"; + String expectedPath = yarnHome + File.separator + "bin" + File.separator + + "container-executor"; Assert.assertEquals(expectedPath, containerExePath); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java index 996fff0de58..05e41c231e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupsHandlerImpl.java @@ -83,8 +83,8 @@ public void setup() { // Sample subsystem. Not used by all the tests controller = CGroupsHandler.CGroupController.NET_CLS; controllerPath = - new File(new File(tmpPath, controller.getName()), hierarchy) - .getAbsolutePath(); + new File(tmpPath, controller.getName()).getAbsolutePath() + + Path.SEPARATOR + hierarchy; } @After @@ -380,8 +380,10 @@ public void testMtabParsing() throws Exception { String cpuDir = controllerPaths.get(CGroupsHandler.CGroupController.CPU); String blkioDir = controllerPaths.get(CGroupsHandler.CGroupController.BLKIO); - Assert.assertEquals(parentDir.getAbsolutePath() + "/cpu", cpuDir); - Assert.assertEquals(parentDir.getAbsolutePath() + "/blkio", blkioDir); + Assert.assertEquals(parentDir.getAbsolutePath() + File.separator + "cpu", + cpuDir); + Assert.assertEquals(parentDir.getAbsolutePath() + File.separator + "blkio", + blkioDir); } /** diff --git a/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 b/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 index 37ffd00cdf5..269dbab0760 100644 --- a/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 +++ b/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 @@ -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);