From d17a7bbf6e4102710d50a4109dfacb70c9ed6494 Mon Sep 17 00:00:00 2001 From: Varun Vasudev Date: Thu, 9 Jul 2015 11:49:28 +0530 Subject: [PATCH] YARN-2194. Addendum patch to fix failing unit test in TestPrivilegedOperationExecutor. Contributed by Sidharta Seethana. (cherry picked from ad5b904175a1f89951c7c32f744a4e20fafb51b5) --- .../linux/privileged/TestPrivilegedOperationExecutor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 7154d03d931..8f297ede75a 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 void testSquashCGroupOperationsWithValidOperations() { .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