Repository: hadoop Updated Branches: refs/heads/branch-2 3757e731e -> 28e0602e7 refs/heads/branch-2.7 b08bc43c9 -> 6855bbc6c refs/heads/trunk a0795c1e8 -> db80e4289
HDFS-8039. Fix TestDebugAdmin#testRecoverLease and testVerfiyBlockChecksumCommand on Windows. Contributed by Xiaoyu Yao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db80e428 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db80e428 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db80e428 Branch: refs/heads/trunk Commit: db80e428919e4e763f56b9344c748e7f8fb46491 Parents: a0795c1 Author: cnauroth <[email protected]> Authored: Fri Apr 3 10:44:02 2015 -0700 Committer: cnauroth <[email protected]> Committed: Fri Apr 3 10:44:02 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/tools/TestDebugAdmin.java | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/db80e428/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 366d8fb..ae56f1b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1370,6 +1370,9 @@ Release 2.7.0 - UNRELEASED TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay for Windows. (Xiaoyu Yao via cnauroth) + HDFS-8039. Fix TestDebugAdmin#testRecoverLease and + testVerifyBlockChecksumCommand on Windows. (Xiaoyu Yao via cnauroth) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode http://git-wip-us.apache.org/repos/asf/hadoop/blob/db80e428/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java index 44b6ba9..52b194d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDebugAdmin.java @@ -77,17 +77,18 @@ public class TestDebugAdmin { System.setOut(oldOut); IOUtils.closeStream(out); } - return "ret: " + ret + ", " + bytes.toString(); + return "ret: " + ret + ", " + + bytes.toString().replaceAll(System.getProperty("line.separator"), ""); } @Test(timeout = 60000) public void testRecoverLease() throws Exception { - assertEquals("ret: 1, You must supply a -path argument to recoverLease.\n", + assertEquals("ret: 1, You must supply a -path argument to recoverLease.", runCmd(new String[]{"recoverLease", "-retries", "1"})); FSDataOutputStream out = fs.create(new Path("/foo")); out.write(123); out.close(); - assertEquals("ret: 0, recoverLease SUCCEEDED on /foo\n", + assertEquals("ret: 0, recoverLease SUCCEEDED on /foo", runCmd(new String[]{"recoverLease", "-path", "/foo"})); } @@ -98,18 +99,18 @@ public class TestDebugAdmin { ExtendedBlock block = DFSTestUtil.getFirstBlock(fs, new Path("/bar")); File blockFile = getBlockFile(fsd, block.getBlockPoolId(), block.getLocalBlock()); - assertEquals("ret: 1, You must specify a meta file with -meta\n", + assertEquals("ret: 1, You must specify a meta file with -meta", runCmd(new String[]{"verify", "-block", blockFile.getAbsolutePath()})); File metaFile = getMetaFile(fsd, block.getBlockPoolId(), block.getLocalBlock()); assertEquals("ret: 0, Checksum type: " + - "DataChecksum(type=CRC32C, chunkSize=512)\n", + "DataChecksum(type=CRC32C, chunkSize=512)", runCmd(new String[]{"verify", "-meta", metaFile.getAbsolutePath()})); assertEquals("ret: 0, Checksum type: " + - "DataChecksum(type=CRC32C, chunkSize=512)\n" + + "DataChecksum(type=CRC32C, chunkSize=512)" + "Checksum verification succeeded on block file " + - blockFile.getAbsolutePath() + "\n", + blockFile.getAbsolutePath(), runCmd(new String[]{"verify", "-meta", metaFile.getAbsolutePath(), "-block", blockFile.getAbsolutePath()})
