hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject hadoop git commit: MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev.
Date Fri, 10 Apr 2015 08:33:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f5b49160d -> b817f0924


MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev.

(cherry picked from commit c91b2de68ad8137a909641fdec498f2024af4476)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b817f092
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b817f092
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b817f092

Branch: refs/heads/branch-2
Commit: b817f0924dae9789df3390e4955921c778fb8a45
Parents: f5b4916
Author: Harsh J <harsh@cloudera.com>
Authored: Fri Apr 10 14:02:26 2015 +0530
Committer: Harsh J <harsh@cloudera.com>
Committed: Fri Apr 10 14:03:37 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/b817f092/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b388f57..f0538c5 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -52,6 +52,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/b817f092/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"));


Mime
View raw message