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

hadoop-mapreduce-project/CHANGES.txt

@@ -1602,6 +1602,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3032. Fixed TaskAttemptImpl so that JobHistory can have error
     information about failed tasks. (Devaraj K via vinodkv)
 
+    MAPREDUCE-3196. TestLinuxContainerExecutorWithMocks fails on Mac OSX.
+    (Arun Murthy via mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java

@@ -106,14 +106,14 @@ public class TestLinuxContainerExecutorWithMocks {
     
     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 workDir = new Path("/tmp");
     int ret = mockExec.launchContainer(container, scriptPath, tokensPath, 
         appSubmitter, appId, workDir);
     assertEquals(0, ret);
     assertEquals(Arrays.asList(appSubmitter, cmd, appId, containerId, 
-        workDir.toString(), "/bin/true", "/dev/null"),
+        workDir.toString(), "/bin/echo", "/dev/null"),
         readMockParams());
   }