diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8a036755b27..117bca21a39 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -230,6 +230,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11988. Fix typo in the document for hadoop fs -find. (Kengo Seki via aajisaka) + HADOOP-10582. Fix the test case for copying to non-existent dir in + TestFsShellCopy. (Kousuke Saruta via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java index bef0c9fc01a..c0a6b20def7 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java @@ -177,9 +177,9 @@ public class TestFsShellCopy { checkPut(0, srcPath, dstPath, useWindowsPath); } - // copy to non-existent subdir - prepPut(childPath, false, false); - checkPut(1, srcPath, dstPath, useWindowsPath); + // copy to non-existent dir + prepPut(dstPath, false, false); + checkPut(1, srcPath, childPath, useWindowsPath); // copy into dir, then with another name prepPut(dstPath, true, true);