From bcfa6d5384f8eaba899c5c59f2b20501bd13644f Mon Sep 17 00:00:00 2001
From: Varun Saxena <varunsaxena@apache.org>
Date: Thu, 17 Nov 2016 00:51:07 +0530
Subject: [PATCH] MAPREDUCE-6811. TestPipeApplication#testSubmitter fails after
 HADOOP-13802 (Brahma Reddy Battula via Varun Saxena)

(cherry picked from commit b8690a9d25cb212d53a92bfa1f76a33b8c74413c)
---
 .../mapred/pipes/TestPipeApplication.java     | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

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 64fdf415013..5fbce5d4c9d 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
@@ -299,28 +299,25 @@ public class TestPipeApplication {
       assertTrue(out.toString().contains(
               "[-lazyOutput <true/false>] // createOutputLazily"));
 
-      assertTrue(out
-              .toString()
-              .contains(
-                      "-conf <configuration file>     specify an application configuration file"));
       assertTrue(out.toString().contains(
-              "-D <property=value>            use value for given property"));
+          "-conf <configuration file>        specify an application "
+              + "configuration file"));
       assertTrue(out.toString().contains(
-              "-fs <local|namenode:port>      specify a namenode"));
+          "-D <property=value>               define a value for a given "
+              + "property"));
+      assertTrue(out.toString()
+          .contains("-fs <local|namenode:port>         specify a namenode"));
       assertTrue(out.toString().contains(
-              "-jt <local|resourcemanager:port>    specify a ResourceManager"));
-      assertTrue(out
-              .toString()
-              .contains(
-                      "-files <comma separated list of files>    specify comma separated files to be copied to the map reduce cluster"));
-      assertTrue(out
-              .toString()
-              .contains(
-                      "-libjars <comma separated list of jars>    specify comma separated jar files to include in the classpath."));
-      assertTrue(out
-              .toString()
-              .contains(
-                      "-archives <comma separated list of archives>    specify comma separated archives to be unarchived on the compute machines."));
+          "-jt <local|resourcemanager:port>  specify a ResourceManager"));
+      assertTrue(out.toString().contains(
+          "-files <file1,...>                specify a comma-separated list of "
+              + "files to be copied to the map reduce cluster"));
+      assertTrue(out.toString().contains(
+          "-libjars <jar1,...>               specify a comma-separated list of "
+              + "jar files to be included in the classpath"));
+      assertTrue(out.toString().contains(
+          "-archives <archive1,...>          specify a comma-separated list of "
+              + "archives to be unarchived on the compute machines"));
     } finally {
       System.setOut(oldps);
       // restore