YARN-2194. Addendum patch to fix failing unit test in TestPrivilegedOperationExecutor. Contributed by Sidharta Seethana.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63d03650 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63d03650 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63d03650 Branch: refs/heads/HDFS-7240 Commit: 63d0365088ff9fca0baaf3c4c3c01f80c72d3281 Parents: 6b7692c Author: Varun Vasudev <vvasu...@apache.org> Authored: Thu Jul 9 11:49:28 2015 +0530 Committer: Varun Vasudev <vvasu...@apache.org> Committed: Thu Jul 9 11:51:59 2015 +0530 ---------------------------------------------------------------------- .../linux/privileged/TestPrivilegedOperationExecutor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/63d03650/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.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/linux/privileged/TestPrivilegedOperationExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java index 7154d03..8f297ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java @@ -217,8 +217,10 @@ public class TestPrivilegedOperationExecutor { .squashCGroupOperations(ops); String expected = new StringBuffer (PrivilegedOperation.CGROUP_ARG_PREFIX) - .append(cGroupTasks1).append(',') - .append(cGroupTasks2).append(',') + .append(cGroupTasks1).append(PrivilegedOperation + .LINUX_FILE_PATH_SEPARATOR) + .append(cGroupTasks2).append(PrivilegedOperation + .LINUX_FILE_PATH_SEPARATOR) .append(cGroupTasks3).toString(); //We expect axactly one argument
