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 ey...@apache.org on 2018/06/13 01:18:16 UTC
[46/50] hadoop git commit: HADOOP-15529.
ContainerLaunch#testInvalidEnvVariableSubstitutionType is not supported in
Windows. Contributed by Giovanni Matteo Fumarola.
HADOOP-15529. ContainerLaunch#testInvalidEnvVariableSubstitutionType is not supported in Windows. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit 6e756e8a620e4d6dc3192986679060c52063489b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d5cd12c0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5cd12c0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5cd12c0
Branch: refs/remotes/origin/branch-3.1
Commit: d5cd12c0826d4ae79e5782e73b5e41dd4ec74692
Parents: 6f67e4d
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:24:34 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 10:25:05 2018 -0700
----------------------------------------------------------------------
.../containermanager/launcher/TestContainerLaunch.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5cd12c0/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
----------------------------------------------------------------------
diff --git a/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 b/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
index fb17c8c..5d77b60 100644
--- a/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
+++ b/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
@@ -1832,7 +1832,11 @@ public class TestContainerLaunch extends BaseContainerManagerTest {
public void testInvalidEnvVariableSubstitutionType1() throws IOException {
Map<String, String> env = new HashMap<String, String>();
// invalid env
- env.put("testVar", "version${foo.version}");
+ String invalidEnv = "version${foo.version}";
+ if (Shell.WINDOWS) {
+ invalidEnv = "version%foo%<>^&|=:version%";
+ }
+ env.put("testVar", invalidEnv);
validateShellExecutorForDifferentEnvs(env);
}
@@ -1843,7 +1847,11 @@ public class TestContainerLaunch extends BaseContainerManagerTest {
public void testInvalidEnvVariableSubstitutionType2() throws IOException {
Map<String, String> env = new HashMap<String, String>();
// invalid env
- env.put("testPath", "/abc:/${foo.path}:/$bar");
+ String invalidEnv = "/abc:/${foo.path}:/$bar";
+ if (Shell.WINDOWS) {
+ invalidEnv = "/abc:/%foo%<>^&|=:path%:/%bar%";
+ }
+ env.put("testPath", invalidEnv);
validateShellExecutorForDifferentEnvs(env);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org