merge MAPREDUCE-4948 from trunk. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435313 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a5eaa11dd2
commit
f18bb1a150
|
@ -102,6 +102,9 @@ Release 2.0.3-alpha - Unreleased
|
|||
|
||||
MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu)
|
||||
|
||||
MAPREDUCE-4948. Fix a failing unit test TestYARNRunner.testHistoryServerToken.
|
||||
(Junping Du via sseth)
|
||||
|
||||
Release 2.0.2-alpha - 2012-09-07
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -112,6 +112,7 @@ public class TestYARNRunner extends TestCase {
|
|||
public void setUp() throws Exception {
|
||||
resourceMgrDelegate = mock(ResourceMgrDelegate.class);
|
||||
conf = new YarnConfiguration();
|
||||
conf.set(YarnConfiguration.RM_PRINCIPAL, "mapred/host@REALM");
|
||||
clientCache = new ClientCache(conf, resourceMgrDelegate);
|
||||
clientCache = spy(clientCache);
|
||||
yarnRunner = new YARNRunner(conf, resourceMgrDelegate, clientCache);
|
||||
|
|
Loading…
Reference in New Issue