HDFS-8844. TestHDFSCLI does not cleanup the test directory (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit c95993cbaf51e2925ea9b1b95cf4f0d879e66489)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 2b19fcb..0c7a272 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -771,6 +771,9 @@
pool to be scanned but there are suspicious blocks. (Colin Patrick McCabe
via yliu)
+ HDFS-8844. TestHDFSCLI does not cleanup the test directory (Masatake
+ Iwasaki via Colin P. McCabe)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
index 8399235..90582ef 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
@@ -16525,7 +16525,7 @@
<command>-cat CLITEST_DATA/file</command>
</test-commands>
<cleanup-commands>
- <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ <command>-fs NAMENODE -rm -r /user/USERNAME CLITEST_DATA/file</command>
<command>rm data</command>
</cleanup-commands>
<comparators>