svn commit: r1612918 - in /hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestDFVariations.java

[arp]

Author: arp
Date: Wed Jul 23 18:54:24 2014
New Revision: 1612918

URL: http://svn.apache.org/r1612918
Log:
HADOOP-10890: Merging r1612917 from branch-2 to branch-2.5.

Modified:
    
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
    
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java

Modified: 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1612918&r1=1612917&r2=1612918&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/CHANGES.txt
 Wed Jul 23 18:54:24 2014
@@ -336,6 +336,9 @@ Release 2.5.0 - UNRELEASED
     HADOOP-10872. TestPathData fails intermittently with "Mkdirs failed
     to create d1". (Yongjun Zhang via Arpit Agarwal)
 
+    HADOOP-10890. TestDFVariations.testMount fails intermittently. (Yongjun
+    Zhang via Arpit Agarwal)
+
 Release 2.4.1 - 2014-06-23 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java?rev=1612918&r1=1612917&r2=1612918&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
 (original)
+++ 
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestDFVariations.java
 Wed Jul 23 18:54:24 2014
@@ -29,14 +29,33 @@ import java.util.Random;
 
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.Shell;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class TestDFVariations {
-
+  private static final String TEST_ROOT_DIR =
+      System.getProperty("test.build.data","build/test/data") + 
"/TestDFVariations";
+  private static File test_root = null;
+
+  @Before
+  public void setup() throws IOException {
+    test_root = new File(TEST_ROOT_DIR);
+    test_root.mkdirs();
+  }
+  
+  @After
+  public void after() throws IOException {
+    FileUtil.setWritable(test_root, true);
+    FileUtil.fullyDelete(test_root);
+    assertTrue(!test_root.exists());
+  }
+  
   public static class XXDF extends DF {
     public XXDF() throws IOException {
-      super(new File(System.getProperty("test.build.data","/tmp")), 0L);
+      super(test_root, 0L);
     }
 
     @Override