hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HADOOP-10582. Fix the test case for copying to non-existent dir in TestFsShellCopy. Contributed by Kousuke Saruta.
Date Mon, 18 May 2015 07:33:08 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 b26d99c39 -> 8969a5d45


HADOOP-10582. Fix the test case for copying to non-existent dir in TestFsShellCopy. Contributed
by Kousuke Saruta.

(cherry picked from commit a46506d99cb1310c0e446d590f36fb9afae0fa60)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8969a5d4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8969a5d4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8969a5d4

Branch: refs/heads/branch-2
Commit: 8969a5d45a425e02ced9d09a26624f15643b5b3a
Parents: b26d99c
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon May 18 16:31:41 2015 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon May 18 16:32:22 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/8969a5d4/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 8a03675..117bca2 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8969a5d4/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);


Mime
View raw message