YARN-7734. Fix UT failure TestContainerLogsPage#testContainerLogPageAccess. Contributed by Tao Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/411993f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/411993f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/411993f6 Branch: refs/heads/HDFS-12943 Commit: 411993f6e5723c8cba8100bff0269418e46f6367 Parents: a71656c Author: Weiwei Yang <w...@apache.org> Authored: Wed Mar 28 17:35:17 2018 +0800 Committer: Weiwei Yang <w...@apache.org> Committed: Wed Mar 28 17:35:38 2018 +0800 ---------------------------------------------------------------------- .../yarn/server/nodemanager/webapp/TestContainerLogsPage.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/411993f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java index 8dc06c7..ece1af4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java @@ -259,6 +259,7 @@ public class TestContainerLogsPage { new ConcurrentHashMap<ContainerId, Container>(); when(context.getContainers()).thenReturn(containers); when(context.getLocalDirsHandler()).thenReturn(dirsHandler); + when(context.getConf()).thenReturn(conf); MockContainer container = new MockContainer(appAttemptId, new AsyncDispatcher(), conf, user, appId, 1); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
