svn commit: r732887 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

[shv]

Author: shv
Date: Thu Jan  8 16:37:29 2009
New Revision: 732887

URL: http://svn.apache.org/viewvc?rev=732887&view=rev
Log:
HADOOP-4982. Merge -r 732881:732882 from trunk to branch 0.20.

Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732887&r1=732886&r2=732887&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Jan  8 16:37:29 2009
@@ -569,6 +569,8 @@
     HADOOP-4966. Marks completed setup tasks for removal. 
     (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-4982. TestFsck should run in Eclipse. (shv)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java?rev=732887&r1=732886&r2=732887&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 (original)
+++ 
hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 Thu Jan  8 16:37:29 2009
@@ -145,7 +145,8 @@
       String block = dfsClient.namenode.
                       getBlockLocations(fileNames[0], 0, Long.MAX_VALUE).
                       get(0).getBlock().getBlockName();
-      File baseDir = new 
File(System.getProperty("test.build.data"),"dfs/data");
+      File baseDir = new File(System.getProperty("test.build.data",
+                                                 
"build/test/data"),"dfs/data");
       for (int i=0; i<8; i++) {
         File blockFile = new File(baseDir, "data" +(i+1)+ "/current/" + block);
         if(blockFile.exists()) {
@@ -256,7 +257,8 @@
     assertTrue(outStr.contains(NamenodeFsck.HEALTHY_STATUS));
     
     // corrupt replicas 
-    File baseDir = new File(System.getProperty("test.build.data"), "dfs/data");
+    File baseDir = new File(System.getProperty("test.build.data",
+                                               "build/test/data"),"dfs/data");
     for (int i=0; i < 6; i++) {
       File blockFile = new File(baseDir, "data" + (i+1) + "/current/" +
                                 block);