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 ae...@apache.org on 2016/09/01 15:50:27 UTC
[31/50] [abbrv] hadoop git commit: YARN-5550.
TestYarnCLI#testGetContainers should format according to CONTAINER_PATTERN.
Contributed by Jonathan Hung.
YARN-5550. TestYarnCLI#testGetContainers should format according to CONTAINER_PATTERN. Contributed by Jonathan Hung.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed6ff5cd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed6ff5cd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed6ff5cd
Branch: refs/heads/HDFS-7240
Commit: ed6ff5cd789cab621fbfb88c8e8de4f215cd2961
Parents: 5d1609d
Author: Zhe Zhang <zh...@apache.org>
Authored: Mon Aug 29 14:46:00 2016 -0700
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Aug 29 14:46:00 2016 -0700
----------------------------------------------------------------------
.../hadoop/yarn/client/cli/ApplicationCLI.java | 9 +++--
.../hadoop/yarn/client/cli/TestYarnCLI.java | 39 ++++++--------------
2 files changed, 17 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed6ff5cd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java
index f0b1c47..21df6a2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ApplicationCLI.java
@@ -67,15 +67,18 @@ public class ApplicationCLI extends YarnCLI {
private static final String APPLICATION_ATTEMPTS_PATTERN =
"%30s\t%20s\t%35s\t%35s"
+ System.getProperty("line.separator");
- private static final String CONTAINER_PATTERN =
- "%30s\t%20s\t%20s\t%20s\t%20s\t%20s\t%35s"
- + System.getProperty("line.separator");
private static final String APP_TYPE_CMD = "appTypes";
private static final String APP_STATE_CMD = "appStates";
private static final String APP_TAG_CMD = "appTags";
private static final String ALLSTATES_OPTION = "ALL";
private static final String QUEUE_CMD = "queue";
+
+ @VisibleForTesting
+ protected static final String CONTAINER_PATTERN =
+ "%30s\t%20s\t%20s\t%20s\t%20s\t%20s\t%35s"
+ + System.getProperty("line.separator");
+
public static final String APPLICATION = "application";
public static final String APPLICATION_ATTEMPT = "applicationattempt";
public static final String CONTAINER = "container";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed6ff5cd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
index 1cd513b..3fdea40 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
@@ -313,34 +313,17 @@ public class TestYarnCLI {
new OutputStreamWriter(baos, "UTF-8");
PrintWriter pw = new PrintWriter(stream);
pw.println("Total number of containers :3");
- pw.print(" Container-Id");
- pw.print("\t Start Time");
- pw.print("\t Finish Time");
- pw.print("\t State");
- pw.print("\t Host");
- pw.print("\t Node Http Address");
- pw.println("\t LOG-URL");
- pw.print(" container_1234_0005_01_000001");
- pw.print("\t"+dateFormat.format(new Date(time1)));
- pw.print("\t"+dateFormat.format(new Date(time2)));
- pw.print("\t COMPLETE");
- pw.print("\t host:1234");
- pw.print("\t http://host:2345");
- pw.println("\t logURL");
- pw.print(" container_1234_0005_01_000002");
- pw.print("\t"+dateFormat.format(new Date(time1)));
- pw.print("\t"+dateFormat.format(new Date(time2)));
- pw.print("\t COMPLETE");
- pw.print("\t host:1234");
- pw.print("\t http://host:2345");
- pw.println("\t logURL");
- pw.print(" container_1234_0005_01_000003");
- pw.print("\t"+dateFormat.format(new Date(time1)));
- pw.print("\t N/A");
- pw.print("\t RUNNING");
- pw.print("\t host:1234");
- pw.print("\t http://host:2345");
- pw.println("\t ");
+ pw.printf(ApplicationCLI.CONTAINER_PATTERN, "Container-Id", "Start Time",
+ "Finish Time", "State", "Host", "Node Http Address", "LOG-URL");
+ pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000001",
+ dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)),
+ "COMPLETE", "host:1234", "http://host:2345", "logURL");
+ pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000002",
+ dateFormat.format(new Date(time1)), dateFormat.format(new Date(time2)),
+ "COMPLETE", "host:1234", "http://host:2345", "logURL");
+ pw.printf(ApplicationCLI.CONTAINER_PATTERN, "container_1234_0005_01_000003",
+ dateFormat.format(new Date(time1)), "N/A", "RUNNING", "host:1234",
+ "http://host:2345", "");
pw.close();
String appReportStr = baos.toString("UTF-8");
Log.info("ExpectedOutput");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org