YARN-909. Merging change r1503365 from branch-2.1-beta to branch-2.1.0-beta.

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

hadoop-yarn-project/CHANGES.txt

@@ -680,6 +680,9 @@ Release 2.1.0-beta - 2013-07-02
     YARN-894. NodeHealthScriptRunner timeout checking is inaccurate on Windows.
     (Chuan Liu via cnauroth)
 
+    YARN-909. Disable TestLinuxContainerExecutorWithMocks on Windows. (Chuan Liu
+    via cnauroth)
+
     YARN-795. Fair scheduler queue metrics should subtract allocated vCores from 
     available vCores. (ywskycn via tucu) 
 

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

@@ -19,6 +19,7 @@
 package org.apache.hadoop.yarn.server.nodemanager;
 
 import static junit.framework.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -79,6 +80,7 @@ public class TestLinuxContainerExecutorWithMocks {
   
   @Before
   public void setup() {
+    assumeTrue(!Path.WINDOWS);
     File f = new File("./src/test/resources/mock-container-executor");
     if(!FileUtil.canExecute(f)) {
       FileUtil.setExecutable(f, true);