HDFS-8642. Make TestFileTruncate more reliable. (Contributed by Rakesh R)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4119ad31 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4119ad31 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4119ad31 Branch: refs/heads/HDFS-7240 Commit: 4119ad3112dcfb7286ca68288489bbcb6235cf53 Parents: 98e5926 Author: Arpit Agarwal <a...@apache.org> Authored: Wed Jul 8 09:31:02 2015 -0700 Committer: Arpit Agarwal <a...@apache.org> Committed: Wed Jul 8 09:31:02 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/namenode/TestFileTruncate.java | 18 ++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4119ad31/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b88b42a..a7c9e7c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1017,6 +1017,9 @@ Release 2.8.0 - UNRELEASED HDFS-8686. WebHdfsFileSystem#getXAttr(Path p, final String name) doesn't work if namespace is in capitals (kanaka kumar avvaru via vinayakumarb) + HDFS-8642. Make TestFileTruncate more reliable. (Rakesh R via + Arpit Agarwal) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4119ad31/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java index e0f9ad2..a91d6c9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java @@ -62,9 +62,8 @@ import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.Time; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Level; -import org.junit.AfterClass; +import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; public class TestFileTruncate { @@ -90,8 +89,8 @@ public class TestFileTruncate { private Path parent; - @BeforeClass - public static void startUp() throws IOException { + @Before + public void setUp() throws IOException { conf = new HdfsConfiguration(); conf.setLong(DFSConfigKeys.DFS_NAMENODE_MIN_BLOCK_SIZE_KEY, BLOCK_SIZE); conf.setInt(DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY, BLOCK_SIZE); @@ -105,20 +104,15 @@ public class TestFileTruncate { .waitSafeMode(true) .build(); fs = cluster.getFileSystem(); + parent = new Path("/test"); } - @AfterClass - public static void tearDown() throws IOException { + @After + public void tearDown() throws IOException { if(fs != null) fs.close(); if(cluster != null) cluster.shutdown(); } - @Before - public void setup() throws IOException { - parent = new Path("/test"); - fs.delete(parent, true); - } - /** * Truncate files of different sizes byte by byte. */