You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/05/21 01:48:40 UTC
[16/50] [abbrv] hadoop git commit: HADOOP-10582. Fix the test case
for copying to non-existent dir in TestFsShellCopy. Contributed by Kousuke
Saruta.
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/a46506d9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a46506d9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a46506d9
Branch: refs/heads/HDFS-7240
Commit: a46506d99cb1310c0e446d590f36fb9afae0fa60
Parents: f5c4823
Author: Akira Ajisaka <aa...@apache.org>
Authored: Mon May 18 16:31:41 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Mon May 18 16:31:41 2015 +0900
----------------------------------------------------------------------
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/a46506d9/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/a46506d9/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);