From 2fb423e195fb1d525304c40ff93966525efb640d Mon Sep 17 00:00:00 2001
From: Varun Vasudev <vvasudev@apache.org>
Date: Fri, 12 Feb 2016 12:01:54 +0530
Subject: [PATCH] YARN-4684. TestYarnCLI#testGetContainers failing in CN
 locale. Contributed by Bibin A Chundatt.

---
 hadoop-yarn-project/CHANGES.txt                          | 3 +++
 .../org/apache/hadoop/yarn/client/cli/TestYarnCLI.java   | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c63a74c0e3..fb685ba986 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -203,6 +203,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
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 3783aac659..5bef6917b9 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 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 void testGetContainers() throws Exception {
     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 void testGetContainers() throws Exception {
     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