From b86332b8e159192449a1c653345aa8d6cbc04251 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Mon, 6 Aug 2012 14:03:52 +0000 Subject: [PATCH] HDFS-3719. Re-enable append-related tests in TestFileConcurrentReader. Contributed by Andrew Wang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369851 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/TestFileConcurrentReader.java | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8240e6e5593..56966afbb2e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -400,6 +400,9 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3756. DelegationTokenFetcher creates 2 HTTP connections, the second one not properly configured. (tucu) + HDFS-3719. Re-enable append-related tests in TestFileConcurrentReader. + (Andrew Wang via atm) + BREAKDOWN OF HDFS-3042 SUBTASKS HDFS-2185. HDFS portion of ZK-based FailoverController (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java index 97659eeab3e..003dc6fbf4f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java @@ -288,10 +288,8 @@ public class TestFileConcurrentReader { runTestUnfinishedBlockCRCError(true, SyncType.SYNC, SMALL_WRITE_SIZE); } - // fails due to issue w/append, disable - @Ignore @Test - public void _testUnfinishedBlockCRCErrorTransferToAppend() + public void testUnfinishedBlockCRCErrorTransferToAppend() throws IOException { runTestUnfinishedBlockCRCError(true, SyncType.APPEND, DEFAULT_WRITE_SIZE); } @@ -307,10 +305,8 @@ public class TestFileConcurrentReader { runTestUnfinishedBlockCRCError(false, SyncType.SYNC, SMALL_WRITE_SIZE); } - // fails due to issue w/append, disable - @Ignore @Test - public void _testUnfinishedBlockCRCErrorNormalTransferAppend() + public void testUnfinishedBlockCRCErrorNormalTransferAppend() throws IOException { runTestUnfinishedBlockCRCError(false, SyncType.APPEND, DEFAULT_WRITE_SIZE); }