YARN-2194. Addendum patch to fix failing unit test in TestPrivilegedOperationExecutor. Contributed by Sidharta Seethana.
(cherry picked from ad5b904175a1f89951c7c32f744a4e20fafb51b5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d17a7bbf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d17a7bbf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d17a7bbf Branch: refs/heads/branch-2 Commit: d17a7bbf6e4102710d50a4109dfacb70c9ed6494 Parents: ee07df6 Author: Varun Vasudev <[email protected]> Authored: Thu Jul 9 11:49:28 2015 +0530 Committer: Varun Vasudev <[email protected]> Committed: Thu Jul 9 11:52:57 2015 +0530 ---------------------------------------------------------------------- .../linux/privileged/TestPrivilegedOperationExecutor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d17a7bbf/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
