From 1db4319072e0e4210df06571cc29b0d0437fb3de Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Mon, 15 Jul 2013 17:27:31 +0000 Subject: [PATCH] YARN-909. Disable TestLinuxContainerExecutorWithMocks on Windows. Contributed by Chuan Liu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503357 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../nodemanager/TestLinuxContainerExecutorWithMocks.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7cd9e2f2e4..7c665ccb7e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -754,6 +754,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) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java index 62bfb39e0c..67e90231f9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java +++ b/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);