HADOOP-10582. Fix the test case for copying to non-existent dir in TestFsShellCopy. Contributed by Kousuke Saruta.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a43d72fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a43d72fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a43d72fc Branch: refs/heads/YARN-2928 Commit: a43d72fcf034206cf69c0fe680902d0ebe198828 Parents: 24ac9db Author: Akira Ajisaka <[email protected]> Authored: Mon May 18 16:31:41 2015 +0900 Committer: Zhijie Shen <[email protected]> Committed: Fri May 22 11:47:01 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a43d72fc/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7349091..2138334 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -695,6 +695,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/a43d72fc/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellCopy.java ---------------------------------------------------------------------- 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 bef0c9f..c0a6b20 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);
