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 vv...@apache.org on 2016/02/12 07:41:13 UTC
[2/2] hadoop git commit: YARN-4684. TestYarnCLI#testGetContainers
failing in CN locale. Contributed by Bibin A Chundatt.
YARN-4684. TestYarnCLI#testGetContainers failing in CN locale. Contributed by Bibin A Chundatt.
(cherry picked from commit 74e9d17a813baeb4e610eb5fdd8e289660346782)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dcead143
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dcead143
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dcead143
Branch: refs/heads/branch-2
Commit: dcead143fe23933c6f0cb9a2b4a7583251814528
Parents: 488e6cb
Author: Varun Vasudev <vv...@apache.org>
Authored: Fri Feb 12 12:01:54 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Fri Feb 12 12:08:57 2016 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java | 9 ++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dcead143/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 13d28ec..71e9293 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -145,6 +145,9 @@ Release 2.9.0 - UNRELEASED
YARN-4629. Distributed shell breaks under strong security.
(Daniel Templeton via stevel)
+ YARN-4684. TestYarnCLI#testGetContainers failing in CN locale.
+ (Bibin A Chundatt via vvasudev)
+
Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/dcead143/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 3783aac..5bef691 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
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
@@ -307,7 +308,9 @@ public class TestYarnCLI {
assertEquals(0, result);
verify(client).getContainers(attemptId);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(baos);
+ OutputStreamWriter stream =
+ 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");
@@ -342,9 +345,9 @@ public class TestYarnCLI {
Log.info("ExpectedOutput");
Log.info("["+appReportStr+"]");
Log.info("OutputFrom command");
- String actualOutput = sysOutStream.toString();
+ String actualOutput = sysOutStream.toString("UTF-8");
Log.info("["+actualOutput+"]");
- Assert.assertEquals(appReportStr, sysOutStream.toString());
+ Assert.assertEquals(appReportStr, actualOutput);
}
@Test