hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [1/2] hadoop git commit: YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only. Contributed by Ming Ma.
Date Sat, 14 Feb 2015 06:02:34 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 c6aa6cbfe -> 48302e687
  refs/heads/trunk f2231cebc -> 6804d6890


YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only. Contributed by Ming Ma.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6804d689
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6804d689
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6804d689

Branch: refs/heads/trunk
Commit: 6804d689019e4d2dfb2b35fd82f775a13e85960c
Parents: f2231ce
Author: cnauroth <cnauroth@apache.org>
Authored: Fri Feb 13 21:58:50 2015 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Fri Feb 13 21:58:54 2015 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../nodemanager/TestDockerContainerExecutorWithMocks.java      | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6804d689/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1644268..e9a7c58 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -596,6 +596,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2847. Linux native container executor segfaults if default banned
     user detected (Olaf Flebbe via jlowe)
 
+    YARN-2899. Run TestDockerContainerExecutorWithMocks on Linux only.
+    (Ming Ma via cnauroth)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6804d689/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java
index fa8bfaf..3584fed 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java
@@ -69,7 +69,7 @@ public class TestDockerContainerExecutorWithMocks {
 
   @Before
   public void setup() {
-    assumeTrue(!Path.WINDOWS);
+    assumeTrue(Shell.LINUX);
     File f = new File("./src/test/resources/mock-container-executor");
     if(!FileUtil.canExecute(f)) {
       FileUtil.setExecutable(f, true);
@@ -101,7 +101,9 @@ public class TestDockerContainerExecutorWithMocks {
   @After
   public void tearDown() {
     try {
-      lfs.delete(workDir, true);
+      if (lfs != null) {
+        lfs.delete(workDir, true);
+      }
     } catch (IOException e) {
       throw new RuntimeException(e);
     }


Mime
View raw message