Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java (revision 154cfb2b620002a7d3b7fdbf8b68236c432771e1) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java (revision d88f205b11ea06d57828ec498b9635afe898de9d) @@ -150,6 +150,7 @@ LinuxContainerRuntime linuxContainerRuntime; LinuxContainerRuntime mockLinuxContainerRuntime; + conf.set(YarnConfiguration.NM_LOG_DIRS, "src/test/resources"); setupMockExecutor(MOCK_EXECUTOR, conf); linuxContainerRuntime = new DefaultLinuxContainerRuntime( PrivilegedOperationExecutor.getInstance(conf)); @@ -281,7 +282,8 @@ Assert.assertEquals(result.get(13), "-Dlog4j.configuration=container-log4j.properties" ); Assert.assertEquals(result.get(14), - "-Dyarn.app.container.log.dir=${yarn.log.dir}/userlogs/application_0/12345"); + String.format("-Dyarn.app.container.log.dir=%s/application_0/12345", + mockExec.getConf().get(YarnConfiguration.NM_LOG_DIRS))); Assert.assertEquals(result.get(15), "-Dyarn.app.container.log.filesize=0"); Assert.assertEquals(result.get(16), "-Dhadoop.root.logger=INFO,CLA");