HADOOP-3388. Fix for TestDatanodeBlockScanner to handle blocks with

generation stamps in them.  (dhruba)




git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@656153 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -235,6 +235,9 @@ Trunk (unreleased changes)
     HADOOP-3365. Removes an unnecessary copy of the key from SegmentDescriptor
     to MergeQueue. (Devaraj Das)
 
+    HADOOP-3388. Fix for TestDatanodeBlockScanner to handle blocks with
+    generation stamps in them.  (dhruba)
+
 Release 0.17.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/test/org/apache/hadoop/dfs/TestDatanodeBlockScanner.java

@@ -174,7 +174,7 @@ public class TestDatanodeBlockScanner extends TestCase {
     fs = cluster.getFileSystem();
     Path file1 = new Path("/tmp/testBlockVerification/file1");
     DFSTestUtil.createFile(fs, file1, 1024, (short)3, 0);
-    String block = DFSTestUtil.getFirstBlock(fs, file1).toString();
+    String block = DFSTestUtil.getFirstBlock(fs, file1).getBlockName();
     
     dfsClient = new DFSClient(new InetSocketAddress("localhost", 
                                         cluster.getNameNodePort()), conf);