Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 426E117D1B for ; Wed, 20 May 2015 23:48:35 +0000 (UTC) Received: (qmail 70197 invoked by uid 500); 20 May 2015 23:48:26 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 69572 invoked by uid 500); 20 May 2015 23:48:25 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 68676 invoked by uid 99); 20 May 2015 23:48:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 May 2015 23:48:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4FFCEE03C7; Wed, 20 May 2015 23:48:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jitendra@apache.org To: common-commits@hadoop.apache.org Date: Wed, 20 May 2015 23:48:40 -0000 Message-Id: <36ab254bf6c742d8a98492ecb86c406b@git.apache.org> In-Reply-To: <28a64198a4a04636b9e7d63b102d56d9@git.apache.org> References: <28a64198a4a04636b9e7d63b102d56d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon May 18 16:31:41 2015 +0900 Committer: Akira Ajisaka 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);