svn commit: r1556319 - in /hadoop/common/branches/branch-2/hadoop-yarn-project: ./ hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/

[jianhe]

Author: jianhe
Date: Tue Jan  7 19:03:50 2014
New Revision: 1556319

URL: http://svn.apache.org/r1556319
Log:
Merge r1556318 from trunk. YARN-1293. Fixed 
TestContainerLaunch#testInvalidEnvSyntaxDiagnostics failure caused by 
non-English system locale. Contributed by Tsuyoshi OZAWA.

Modified:
    hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1556319&r1=1556318&r2=1556319&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jan  7 
19:03:50 2014
@@ -280,6 +280,9 @@ Release 2.4.0 - UNRELEASED
     YARN-1409. NonAggregatingLogHandler can throw RejectedExecutionException
     (Tsuyoshi OZAWA via jlowe)
 
+    YARN-1293. Fixed TestContainerLaunch#testInvalidEnvSyntaxDiagnostics 
failure
+    caused by non-English system locale. (Tsuyoshi OZAWA via jianhe)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java?rev=1556319&r1=1556318&r2=1556319&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java
 Tue Jan  7 19:03:50 2014
@@ -260,8 +260,12 @@ public class TestContainerLaunch extends
       fos.flush();
       fos.close();
 
+      // It is supposed that LANG is set as C.
+      Map<String, String> cmdEnv = new HashMap<String, String>();
+      cmdEnv.put("LANG", "C");
       Shell.ShellCommandExecutor shexc
-      = new Shell.ShellCommandExecutor(new 
String[]{shellFile.getAbsolutePath()}, tmpDir);
+      = new Shell.ShellCommandExecutor(new 
String[]{shellFile.getAbsolutePath()},
+        tmpDir, cmdEnv);
       String diagnostics = null;
       try {
         shexc.execute();