svn commit: r1127353 - in /hadoop/hdfs/branches/HDFS-1073: CHANGES.HDFS-1073.txt src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java

[to...@apache.org]

Author: todd
Date: Wed May 25 01:10:42 2011
New Revision: 1127353

URL: http://svn.apache.org/viewvc?rev=1127353&view=rev
Log:
HDFS-1993. TestCheckpoint needs to clean up between cases. Contributed by Todd Lipcon.

Modified:
    hadoop/hdfs/branches/HDFS-1073/CHANGES.HDFS-1073.txt
    hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java

Modified: hadoop/hdfs/branches/HDFS-1073/CHANGES.HDFS-1073.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/CHANGES.HDFS-1073.txt?rev=1127353&r1=1127352&r2=1127353&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/CHANGES.HDFS-1073.txt (original)
+++ hadoop/hdfs/branches/HDFS-1073/CHANGES.HDFS-1073.txt Wed May 25 01:10:42 2011
@@ -34,3 +34,4 @@ HDFS-1985. Clean up image transfer servl
 HDFS-1984. Enable multiple secondary namenodes to run simultaneously (todd)
 HDFS-1987. Re-enable TestCheckpoint.testSecondaryImageDownload which was not
            running previously. (todd)
+HDFS-1993. TestCheckpoint needs to clean up between cases (todd)

Modified: hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java?rev=1127353&r1=1127352&r2=1127353&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java (original)
+++ hadoop/hdfs/branches/HDFS-1073/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java Wed May 25 01:10:42 2011
@@ -79,6 +79,11 @@ public class TestCheckpoint extends Test
   static final int fileSize = 8192;
   static final int numDatanodes = 3;
   short replication = 3;
+  
+  @Override
+  public void setUp() throws IOException {
+    FileUtil.fullyDeleteContents(new File(MiniDFSCluster.getBaseDirectory()));
+  }
 
   static void writeFile(FileSystem fileSys, Path name, int repl)
     throws IOException {
@@ -877,7 +882,7 @@ public class TestCheckpoint extends Test
     Configuration conf = new HdfsConfiguration();
 
     cluster = new MiniDFSCluster.Builder(conf).numDataNodes(numDatanodes)
-        .format(false).build();
+        .format(true).build();
     NameNode nn = cluster.getNameNode();
 
     SecondaryNameNode secondary = startSecondaryNameNode(conf);