瀏覽代碼

MAPREDUCE-3281. Fixed a bug in TestLinuxContainerExecutorWithMocks. (vinodkv)
svn merge -c r1189818 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189819 13f79535-47bb-0310-9956-ffa450edef68

Vinod Kumar Vavilapalli 13 年之前
父節點
當前提交
4f1d9492f0

+ 2 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -1750,6 +1750,8 @@ Release 0.23.0 - Unreleased
     containers (process-trees) irrespective of whether the container succeeded,
     or killed. Contributed by Hitesh Shah.
 
+    MAPREDUCE-3281. Fixed a bug in TestLinuxContainerExecutorWithMocks. (vinodkv)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

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

@@ -117,7 +117,7 @@ public class TestLinuxContainerExecutorWithMocks {
         appSubmitter, appId, workDir);
     assertEquals(0, ret);
     assertEquals(Arrays.asList(appSubmitter, cmd, appId, containerId,
-        workDir.toString(), "/bin/echo", "/dev/null", pidFile),
+        workDir.toString(), "/bin/echo", "/dev/null", pidFile.toString()),
         readMockParams());
   }