hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From varunsax...@apache.org
Subject hadoop git commit: MAPREDUCE-6811. TestPipeApplication#testSubmitter fails after HADOOP-13802 (Brahma Reddy Battula via Varun Saxena)
Date Wed, 16 Nov 2016 19:25:32 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 2893316dd -> bcfa6d538


MAPREDUCE-6811. TestPipeApplication#testSubmitter fails after HADOOP-13802 (Brahma Reddy Battula
via Varun Saxena)

(cherry picked from commit b8690a9d25cb212d53a92bfa1f76a33b8c74413c)


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

Branch: refs/heads/branch-2
Commit: bcfa6d5384f8eaba899c5c59f2b20501bd13644f
Parents: 2893316
Author: Varun Saxena <varunsaxena@apache.org>
Authored: Thu Nov 17 00:51:07 2016 +0530
Committer: Varun Saxena <varunsaxena@apache.org>
Committed: Thu Nov 17 00:55:12 2016 +0530

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bcfa6d53/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 64fdf41..5fbce5d 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 <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(
-              "-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."));
+          "-archives <archive1,...>          specify a comma-separated list of "
+              + "archives to be unarchived on the compute machines"));
     } finally {
       System.setOut(oldps);
       // restore


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message