svn commit: r1429233 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java

[acmurthy]

Author: acmurthy
Date: Sat Jan  5 08:15:57 2013
New Revision: 1429233

URL: http://svn.apache.org/viewvc?rev=1429233&view=rev
Log:
MAPREDUCE-4916. Fix flaxy test TestTrackerDistributedCacheManager. Contributed 
by Xuan Gong.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1429233&r1=1429232&r2=1429233&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sat Jan  5 08:15:57 2013
@@ -395,6 +395,9 @@ Release 1.2.0 - unreleased
 
     HADOOP-9179. TestFileSystem fails with open JDK7. (Brandon Li via suresh)
 
+    MAPREDUCE-4916. Fix flaxy test TestTrackerDistributedCacheManager. (Xuan
+    Gong via acmurthy) 
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java?rev=1429233&r1=1429232&r2=1429233&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java
 Sat Jan  5 08:15:57 2013
@@ -92,9 +92,10 @@ public class TestTrackerDistributedCache
 
     // Prepare the tests' root dir
     File TEST_ROOT = new File(TEST_ROOT_DIR);
-    if (!TEST_ROOT.exists()) {
-      TEST_ROOT.mkdirs();
+    if (TEST_ROOT.exists()) {
+      FileUtil.fullyDelete(new File(TEST_ROOT_DIR));
     }
+    TEST_ROOT.mkdirs();
 
     conf = new Configuration();
     conf.set(FileSystem.FS_DEFAULT_NAME_KEY, "file:///");