diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 6644e44453d..86bcd5005d2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -163,6 +163,7 @@ import org.apache.hadoop.yarn.util.resource.ResourceCalculator; import org.apache.hadoop.yarn.util.resource.ResourceUtils; import org.apache.hadoop.yarn.util.resource.Resources; +import org.junit.After; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -183,6 +184,7 @@ private final static String QUEUE_1 = "Q-1"; private final static String QUEUE_2 = "Q-2"; + private File resourceTypesFile = null; @Test public void testGetDecommissioningClusterNodes() throws Exception { @@ -2252,12 +2254,12 @@ public void handle(Event event) { public void testRegisterNMWithDiffUnits() throws Exception { ResourceUtils.resetResourceTypes(); Configuration yarnConf = new YarnConfiguration(); - String resourceTypesFile = "resource-types-4.xml"; + String resourceTypesFileName = "resource-types-4.xml"; InputStream source = - yarnConf.getClassLoader().getResourceAsStream(resourceTypesFile); - File dest = new File(yarnConf.getClassLoader(). + yarnConf.getClassLoader().getResourceAsStream(resourceTypesFileName); + resourceTypesFile = new File(yarnConf.getClassLoader(). getResource(".").getPath(), "resource-types.xml"); - FileUtils.copyInputStreamToFile(source, dest); + FileUtils.copyInputStreamToFile(source, resourceTypesFile); ResourceUtils.getResourceTypes(); yarnConf.setClass( @@ -2326,9 +2328,13 @@ protected ClientRMService createClientRMService() { rpc.stopProxy(client, conf); rm.close(); + } - if (dest.exists()) { - dest.delete(); + @After + public void tearDown(){ + if (resourceTypesFile != null && resourceTypesFile.exists()) { + resourceTypesFile.delete(); + resourceTypesFile = null; } } }