瀏覽代碼

HDFS-10415. TestDistributedFileSystem#MyDistributedFileSystem attempts to set up statistics before initialize() is called (Mingliang Liu via cmccabe)

Colin Patrick Mccabe 9 年之前
父節點
當前提交
14907d9b8c

+ 7 - 1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java

@@ -229,13 +229,19 @@ public class TestDistributedFileSystem {
   
   
   private static class MyDistributedFileSystem extends DistributedFileSystem {
   private static class MyDistributedFileSystem extends DistributedFileSystem {
     MyDistributedFileSystem() {
     MyDistributedFileSystem() {
-      statistics = new FileSystem.Statistics("myhdfs"); // can't mock finals
       dfs = mock(DFSClient.class);
       dfs = mock(DFSClient.class);
     }
     }
     @Override
     @Override
     public boolean exists(Path p) {
     public boolean exists(Path p) {
       return true; // trick out deleteOnExit
       return true; // trick out deleteOnExit
     }
     }
+    // Symlink resolution doesn't work with a mock, since it doesn't
+    // have a valid Configuration to resolve paths to the right FileSystem.
+    // Just call the DFSClient directly to register the delete
+    @Override
+    public boolean delete(Path f, final boolean recursive) throws IOException {
+      return dfs.delete(f.toUri().getPath(), recursive);
+    }
   }
   }
 
 
   @Test
   @Test