HADOOP-9847. TestGlobPath symlink tests fail to cleanup properly. (cmccabe via wang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513255 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -299,6 +299,9 @@ Release 2.1.0-beta - 2013-08-06
     HADOOP-9786. RetryInvocationHandler#isRpcInvocation should support 
     ProtocolTranslator. (suresh and jing9)
 
+    HADOOP-9847. TestGlobPath symlink tests fail to cleanup properly.
+    (cmccabe via wang)
+
   OPTIMIZATIONS
 
     HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestGlobPaths.java

@@ -405,6 +405,8 @@ public class TestGlobPaths {
 
     status = fs.globStatus(new Path("/x/x"), falseFilter);
     assertNull(status);
+
+    cleanupDFS();
   }
   
   private void checkStatus(FileStatus[] status, Path ... expectedMatches) {
@@ -783,8 +785,7 @@ public class TestGlobPaths {
     return globResults;
   }
   
-  @After
-  public void cleanupDFS() throws IOException {
+  private void cleanupDFS() throws IOException {
     fs.delete(new Path(USER_DIR), true);
   }