HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/332e2e23 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/332e2e23 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/332e2e23 Branch: refs/heads/HDFS-6581 Commit: 332e2e23ba6f0748a46c0bda76f426d9cad73edd Parents: b6ceef9 Author: cnauroth <cnaur...@apache.org> Authored: Fri Sep 19 21:04:55 2014 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Fri Sep 19 21:04:55 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/332e2e23/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 8c45d69..fa9bbcd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -897,6 +897,9 @@ Release 2.6.0 - UNRELEASED HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. (cnauroth) + HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log + output change. (Ray Chiang via cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/332e2e23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java index a7ee927..1bf3add 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java @@ -287,7 +287,7 @@ public class TestJournalNode { // Directory which cannot be created conf.set(DFSConfigKeys.DFS_JOURNALNODE_EDITS_DIR_KEY, Shell.WINDOWS ? "\\\\cannotBeCreated" : "/proc/does-not-exist"); - assertJNFailsToStart(conf, "Can not create directory"); + assertJNFailsToStart(conf, "Cannot create directory"); } private static void assertJNFailsToStart(Configuration conf,
