From b0456745f9c0d446387b68be3c38cdfbd58dbf89 Mon Sep 17 00:00:00 2001
From: Kihwal Lee <kihwal@apache.org>
Date: Thu, 13 Feb 2014 15:06:17 +0000
Subject: [PATCH] HDFS-5904. TestFileStatus fails intermittently. Contributed
 by Mit Desai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567946 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                     | 2 ++
 .../src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 15026dd4ad9..1147ef0f215 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -433,6 +433,8 @@ Release 2.4.0 - UNRELEASED
     HDFS-5891. webhdfs should not try connecting the DN during redirection
     (Haohui Mai via brandonli)
 
+    HDFS-5904. TestFileStatus fails intermittently. (Mit Desai via kihwal)
+ 
 Release 2.3.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java
index 9c44029bfef..2644420ee1a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java
@@ -303,5 +303,6 @@ public class TestFileStatus {
         FileSystem.LOG.info("GOOD: getting an exception", ioe);
       }
     }
+    fs.delete(dir, true);
   }
 }