MAPREDUCE-3196. TestLinuxContainerExecutorWithMocks fails on Mac OSX. (Arun Murthy via mahadev) - Merging r1185417 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185419 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2ce6540fb0
commit
203f3e1362
|
@ -1602,6 +1602,9 @@ Release 0.23.0 - Unreleased
|
||||||
MAPREDUCE-3032. Fixed TaskAttemptImpl so that JobHistory can have error
|
MAPREDUCE-3032. Fixed TaskAttemptImpl so that JobHistory can have error
|
||||||
information about failed tasks. (Devaraj K via vinodkv)
|
information about failed tasks. (Devaraj K via vinodkv)
|
||||||
|
|
||||||
|
MAPREDUCE-3196. TestLinuxContainerExecutorWithMocks fails on Mac OSX.
|
||||||
|
(Arun Murthy via mahadev)
|
||||||
|
|
||||||
Release 0.22.0 - Unreleased
|
Release 0.22.0 - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -106,14 +106,14 @@ public class TestLinuxContainerExecutorWithMocks {
|
||||||
|
|
||||||
when(context.getEnvironment()).thenReturn(env);
|
when(context.getEnvironment()).thenReturn(env);
|
||||||
|
|
||||||
Path scriptPath = new Path("file:///bin/true");
|
Path scriptPath = new Path("file:///bin/echo");
|
||||||
Path tokensPath = new Path("file:///dev/null");
|
Path tokensPath = new Path("file:///dev/null");
|
||||||
Path workDir = new Path("/tmp");
|
Path workDir = new Path("/tmp");
|
||||||
int ret = mockExec.launchContainer(container, scriptPath, tokensPath,
|
int ret = mockExec.launchContainer(container, scriptPath, tokensPath,
|
||||||
appSubmitter, appId, workDir);
|
appSubmitter, appId, workDir);
|
||||||
assertEquals(0, ret);
|
assertEquals(0, ret);
|
||||||
assertEquals(Arrays.asList(appSubmitter, cmd, appId, containerId,
|
assertEquals(Arrays.asList(appSubmitter, cmd, appId, containerId,
|
||||||
workDir.toString(), "/bin/true", "/dev/null"),
|
workDir.toString(), "/bin/echo", "/dev/null"),
|
||||||
readMockParams());
|
readMockParams());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue