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 st...@apache.org on 2018/06/14 17:00:09 UTC
[09/50] [abbrv] 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.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e756e8a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e756e8a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e756e8a
Branch: refs/heads/HADOOP-15407
Commit: 6e756e8a620e4d6dc3192986679060c52063489b
Parents: 10d0e4b
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:24:34 2018 -0700
----------------------------------------------------------------------
.../containermanager/launcher/TestContainerLaunch.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e756e8a/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 da9bc89..ebdceea 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
@@ -1920,7 +1920,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);
}
@@ -1931,7 +1935,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