MAPREDUCE-2032. Fixes TestJobCleanup to cleanup test directory in tearDown. Contributed by Dick King

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@994941 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 8848fd1..47533fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -286,6 +286,9 @@
     MAPREDUCE-1597. Fixes CombineFileInputFormat to work with non-splittable
     files. (amareshwari)
 
+    MAPREDUCE-2032. Fixes TestJobCleanup to cleanup test directory in
+    tearDown. (Dick King via amareshwari)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java b/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java
index 61d4a5a..3635892 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestJobCleanup.java
@@ -77,6 +77,7 @@
       
       protected void tearDown() throws Exception {
         if (fileSys != null) {
+          fileSys.delete(new Path(TEST_ROOT_DIR), true);
           fileSys.close();
         }
         if (mr != null) {
@@ -302,4 +303,4 @@
                   CommitterWithCustomDeprecatedCleanup.class, 
                   new String[] {FileOutputCommitter.SUCCEEDED_FILE_NAME});
   }
-}
\ No newline at end of file
+}