Repository: hadoop Updated Branches: refs/heads/trunk 9e40de6af -> c7cee9b45
YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Contributed by Vinod Kumar Vavilapalli and Tsuyoshi OZAWA) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c7cee9b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c7cee9b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c7cee9b4 Branch: refs/heads/trunk Commit: c7cee9b4551918d5d35bf4e9dc73982a050c73ba Parents: 9e40de6 Author: junping_du <[email protected]> Authored: Thu Oct 2 08:02:59 2014 -0700 Committer: junping_du <[email protected]> Committed: Thu Oct 2 08:02:59 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/nodemanager/TestDirectoryCollection.java | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c7cee9b4/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c1bd908..1785ae2 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -38,6 +38,9 @@ Release 2.7.0 - UNRELEASED IMPROVEMENTS + YARN-1979. TestDirectoryCollection fails when the umask is unusual. + (Vinod Kumar Vavilapalli and Tsuyoshi OZAWA via junping_du) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/c7cee9b4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDirectoryCollection.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/TestDirectoryCollection.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDirectoryCollection.java index 8528721..f19731f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDirectoryCollection.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDirectoryCollection.java @@ -31,9 +31,9 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.junit.AfterClass; +import org.junit.After; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; public class TestDirectoryCollection { @@ -42,14 +42,14 @@ public class TestDirectoryCollection { TestDirectoryCollection.class.getName()).getAbsoluteFile(); private static final File testFile = new File(testDir, "testfile"); - @BeforeClass - public static void setup() throws IOException { + @Before + public void setup() throws IOException { testDir.mkdirs(); testFile.createNewFile(); } - @AfterClass - public static void teardown() { + @After + public void teardown() { FileUtil.fullyDelete(testDir); }
