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

[shv]

Author: shv
Date: Thu Jan  8 16:49:51 2009
New Revision: 732888

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

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

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=732888&r1=732887&r2=732888&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Thu Jan  8 16:49:51 2009
@@ -44,6 +44,8 @@
     HADOOP-4992. Fixes a package name problem introduced by HADOOP-4847.
     (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.19/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java?rev=732888&r1=732887&r2=732888&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 (original)
+++ 
hadoop/core/branches/branch-0.19/src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 Thu Jan  8 16:49:51 2009
@@ -146,7 +146,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()) {
@@ -255,7 +256,8 @@
     assertTrue(outStr.contains("HEALTHY"));
     
     // 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);