Index: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/PlatformAssumptions.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/PlatformAssumptions.java (revision 9c4cbed8d19ec0f486af454de6b117d77a0a0b84) +++ hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/PlatformAssumptions.java (revision 47db3eab33673ffd096e19a10aa11d3a229194f3) @@ -25,7 +25,6 @@ public final class PlatformAssumptions { public static final String OS_NAME = System.getProperty("os.name"); public static final boolean WINDOWS = OS_NAME.startsWith("Windows"); - public static final boolean MAC_OS = OS_NAME.startsWith("Mac OS X"); private PlatformAssumptions() { } @@ -45,11 +44,4 @@ "Expected Windows platform but got " + OS_NAME); } } - - public static void assumeMacOS() { - if (!MAC_OS) { - throw new AssumptionViolatedException( - "Expected MacOS platform but got " + OS_NAME); - } - } } Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupElasticMemoryController.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupElasticMemoryController.java (revision 9c4cbed8d19ec0f486af454de6b117d77a0a0b84) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupElasticMemoryController.java (revision 47db3eab33673ffd096e19a10aa11d3a229194f3) @@ -38,7 +38,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.apache.hadoop.test.PlatformAssumptions.assumeMacOS; /** * Test for elastic non-strict memory controller based on cgroups. @@ -257,26 +256,20 @@ /** * Test that node manager can exit listening. - * This is done by running a long running listener for 10 seconds. + * This is done by running a long running listener for 10000 seconds. * Then we wait for 2 seconds and stop listening. + * We do not use a script this time to avoid leaking the child process. * @throws Exception exception occurred */ @Test(timeout = 20000) public void testNormalExit() throws Exception { - // TODO This may hang on Linux - assumeMacOS(); conf.set(YarnConfiguration.NM_ELASTIC_MEMORY_CONTROL_OOM_LISTENER_PATH, - script.getAbsolutePath()); + "sleep"); ExecutorService service = Executors.newFixedThreadPool(1); try { - FileUtils.writeStringToFile(script, - "#!/bin/bash\nsleep 10000;", - Charset.defaultCharset(), false); - assertTrue("Could not set executable", - script.setExecutable(true)); - CGroupsHandler cgroups = mock(CGroupsHandler.class); - when(cgroups.getPathForCGroup(any(), any())).thenReturn(""); + // This will be passed to sleep as an argument + when(cgroups.getPathForCGroup(any(), any())).thenReturn("10000"); when(cgroups.getCGroupParam(any(), any(), any())) .thenReturn("under_oom 0"); @@ -308,8 +301,6 @@ controller.run(); } finally { service.shutdown(); - assertTrue(String.format("Could not clean up script %s", - script.getAbsolutePath()), script.delete()); } }