You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2015/04/10 10:32:45 UTC
hadoop git commit: MAPREDUCE-6314. TestPipeApplication fails on
trunk. Contributed by Varun Vasudev.
Repository: hadoop
Updated Branches:
refs/heads/trunk afa5d4715 -> c91b2de68
MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c91b2de6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c91b2de6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c91b2de6
Branch: refs/heads/trunk
Commit: c91b2de68ad8137a909641fdec498f2024af4476
Parents: afa5d47
Author: Harsh J <ha...@cloudera.com>
Authored: Fri Apr 10 14:02:26 2015 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Fri Apr 10 14:02:26 2015 +0530
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c91b2de6/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 4a45386..665cb63 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -297,6 +297,9 @@ Release 2.8.0 - UNRELEASED
BUG FIXES
+ MAPREDUCE-6314. TestPipeApplication fails on trunk.
+ (Varun Vasudev via harsh)
+
MAPREDUCE-5448. MapFileOutputFormat#getReaders bug with hidden
files/folders. (Maysam Yabandeh via harsh)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c91b2de6/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
index 093388a..64fdf41 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
@@ -278,7 +278,7 @@ public class TestPipeApplication {
} catch (ExitUtil.ExitException e) {
// System.exit prohibited! output message test
assertTrue(out.toString().contains(""));
- assertTrue(out.toString().contains("bin/hadoop pipes"));
+ assertTrue(out.toString(), out.toString().contains("pipes"));
assertTrue(out.toString().contains("[-input <path>] // Input directory"));
assertTrue(out.toString()
.contains("[-output <path>] // Output directory"));