Repository: hadoop Updated Branches: refs/heads/branch-2 52ee3ecdf -> c6e79178d
HADOOP-12268. AbstractContractAppendTest#testRenameFileBeingAppended misses rename operation. Contributed by Zhihai Xu (cherry picked from commit a628a6f126473a99f9370ba642994ce2909a2d9e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b9ec7f15 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b9ec7f15 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b9ec7f15 Branch: refs/heads/branch-2 Commit: b9ec7f15d03933aa2538d8c764f71045399111ad Parents: 52ee3ec Author: Zhihai Xu <[email protected]> Authored: Fri Jul 31 21:32:45 2015 -0700 Committer: Zhihai Xu <[email protected]> Committed: Fri Jul 31 21:47:34 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../apache/hadoop/fs/contract/AbstractContractAppendTest.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9ec7f15/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 332f1eb..d0fc167 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -543,6 +543,9 @@ Release 2.8.0 - UNRELEASED each platform, not hardcoded to their Linux values (Martin Walsh via Colin P. McCabe) + HADOOP-12268. AbstractContractAppendTest#testRenameFileBeingAppended + misses rename operation. (Zhihai Xu) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9ec7f15/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java index 9628705..d3e6741 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java @@ -24,13 +24,12 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.hadoop.fs.contract.ContractTestUtils.cleanup; import static org.apache.hadoop.fs.contract.ContractTestUtils.createFile; import static org.apache.hadoop.fs.contract.ContractTestUtils.dataset; import static org.apache.hadoop.fs.contract.ContractTestUtils.touch; /** - * Test concat -if supported + * Test append -if supported */ public abstract class AbstractContractAppendTest extends AbstractFSContractTestBase { private static final Logger LOG = @@ -112,6 +111,7 @@ public abstract class AbstractContractAppendTest extends AbstractFSContractTestB FSDataOutputStream outputStream = getFileSystem().append(target); outputStream.write(dataset); Path renamed = new Path(testPath, "renamed"); + rename(target, renamed); outputStream.close(); String listing = ls(testPath);
