Author: shv Date: Wed Sep 21 02:34:25 2011 New Revision: 1173466 URL: http://svn.apache.org/viewvc?rev=1173466&view=rev Log: HADOOP-7663. Fix TestHDFSTrash failure. Contributed by Mayank Bansal.
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/fs/TestTrash.java Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1173466&r1=1173465&r2=1173466&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Wed Sep 21 02:34:25 2011 @@ -539,6 +539,8 @@ Release 0.22.0 - Unreleased HADOOP-7568. SequenceFile should not print into stdout. (Plamen Jeliazkov via shv) + HADOOP-7663. Fix TestHDFSTrash failure. (Mayank Bansal via shv) + Release 0.21.1 - Unreleased IMPROVEMENTS Modified: hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/fs/TestTrash.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/fs/TestTrash.java?rev=1173466&r1=1173465&r2=1173466&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/fs/TestTrash.java (original) +++ hadoop/common/branches/branch-0.22/common/src/test/core/org/apache/hadoop/fs/TestTrash.java Wed Sep 21 02:34:25 2011 @@ -424,6 +424,9 @@ public class TestTrash extends TestCase conf.set(FS_TRASH_INTERVAL_KEY, "0.2"); // 12 seconds conf.setClass("fs.file.impl", TestLFS.class, FileSystem.class); conf.set(FS_TRASH_CHECKPOINT_INTERVAL_KEY, "0.1"); // 6 seconds + FileSystem fs = FileSystem.getLocal(conf); + conf.set("fs.default.name", fs.getUri().toString()); + Trash trash = new Trash(conf); // Start Emptier in background @@ -431,8 +434,6 @@ public class TestTrash extends TestCase Thread emptierThread = new Thread(emptier); emptierThread.start(); - FileSystem fs = FileSystem.getLocal(conf); - conf.set("fs.default.name", fs.getUri().toString()); FsShell shell = new FsShell(); shell.setConf(conf); shell.init();