YARN-8039. Clean up log dir configuration in TestLinuxContainerExecutorWithMocks.testStartLocalizer. Contributed by Miklos Szegedi.

This commit is contained in:
Yufei Gu 2018-03-16 16:25:33 -07:00
parent 08ff1586d5
commit 49c747ab18
1 changed files with 3 additions and 1 deletions

View File

@ -150,6 +150,7 @@ public class TestLinuxContainerExecutorWithMocks {
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 @@ public class TestLinuxContainerExecutorWithMocks {
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");