HDFS-8847. change TestHDFSContractAppend to not override testRenameFileBeingAppended method. Contributed by Zhihai Xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/402fabd9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/402fabd9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/402fabd9 Branch: refs/heads/YARN-2928 Commit: 402fabd95a5b5fdeb0f3f43cfde1e1b5dbe3f731 Parents: 1cac8b2 Author: Zhihai Xu <[email protected]> Authored: Fri Jul 31 21:40:43 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Mon Aug 3 17:02:14 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../fs/contract/hdfs/TestHDFSContractAppend.java | 15 --------------- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/402fabd9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d5181e7..a2d7c2f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1106,6 +1106,9 @@ Release 2.8.0 - UNRELEASED HDFS-8670. Better to exclude decommissioned nodes for namenode NodeUsage JMX (J.Andreina via vinayakumarb) + HDFS-8847. change TestHDFSContractAppend to not override + testRenameFileBeingAppended method. (Zhihai Xu) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/402fabd9/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java index c9148e1..897354c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/TestHDFSContractAppend.java @@ -17,11 +17,9 @@ package org.apache.hadoop.fs.contract.hdfs; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.contract.AbstractContractAppendTest; import org.apache.hadoop.fs.contract.AbstractFSContract; -import org.apache.hadoop.fs.contract.ContractTestUtils; import org.junit.AfterClass; import org.junit.BeforeClass; -import java.io.FileNotFoundException; import java.io.IOException; public class TestHDFSContractAppend extends AbstractContractAppendTest { @@ -40,17 +38,4 @@ public class TestHDFSContractAppend extends AbstractContractAppendTest { protected AbstractFSContract createContract(Configuration conf) { return new HDFSContract(conf); } - - @Override - public void testRenameFileBeingAppended() throws Throwable { - try { - super.testRenameFileBeingAppended(); - fail("Expected a FileNotFoundException"); - } catch (FileNotFoundException e) { - // downgrade - ContractTestUtils.downgrade("Renaming an open file" + - "still creates the old path", e); - - } - } }
