You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2015/02/16 19:31:48 UTC
[41/50] [abbrv] hadoop git commit: YARN-2899. Run
TestDockerContainerExecutorWithMocks on Linux only. Contributed by Ming Ma.
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/a3fc81fa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a3fc81fa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a3fc81fa
Branch: refs/heads/HDFS-7285
Commit: a3fc81fa0e62287475920f8ae4019b4a4b5569a3
Parents: b6fc5b8
Author: cnauroth <cn...@apache.org>
Authored: Fri Feb 13 21:58:50 2015 -0800
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Feb 16 10:29:50 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/a3fc81fa/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/a3fc81fa/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);
}