From 14b01dd04608669582e8ef934253b05c2f841ac0 Mon Sep 17 00:00:00 2001 From: Charles Lamb Date: Tue, 19 Aug 2014 20:41:15 +0000 Subject: [PATCH] HDFS-6872. Fix TestOptionsParser. (clamb) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618974 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES-fs-encryption.txt | 2 ++ .../test/java/org/apache/hadoop/tools/TestOptionsParser.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES-fs-encryption.txt b/hadoop-mapreduce-project/CHANGES-fs-encryption.txt index 9127a24ee3..3e1718e624 100644 --- a/hadoop-mapreduce-project/CHANGES-fs-encryption.txt +++ b/hadoop-mapreduce-project/CHANGES-fs-encryption.txt @@ -14,5 +14,7 @@ fs-encryption (Unreleased) MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace extended attributes. (clamb) + HDFS-6872. Fix TestOptionsParser. (clamb) + BUG FIXES diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java index d3da68ed38..2c42269c37 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java @@ -357,7 +357,8 @@ public void testToString() { DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz")); String val = "DistCpOptions{atomicCommit=false, syncFolder=false, deleteMissing=false, " + "ignoreFailures=false, maxMaps=20, sslConfigurationFile='null', copyStrategy='uniformsize', " + - "sourceFileListing=abc, sourcePaths=null, targetPath=xyz, targetPathExists=true}"; + "sourceFileListing=abc, sourcePaths=null, targetPath=xyz, targetPathExists=true, " + + "preserveRawXattrs=false}"; Assert.assertEquals(val, option.toString()); Assert.assertNotSame(DistCpOptionSwitch.ATOMIC_COMMIT.toString(), DistCpOptionSwitch.ATOMIC_COMMIT.name());