From c91b2de68ad8137a909641fdec498f2024af4476 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Fri, 10 Apr 2015 14:02:26 +0530 Subject: [PATCH] MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev. --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapred/pipes/TestPipeApplication.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 4a4538663c7..665cb6386a7 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) 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 093388a530e..64fdf415013 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 void testSubmitter() throws Exception { } 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 ] // Input directory")); assertTrue(out.toString() .contains("[-output ] // Output directory"));