svn commit: r1484575 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java

[hitesh]

Author: hitesh
Date: Mon May 20 20:02:07 2013
New Revision: 1484575

URL: http://svn.apache.org/r1484575
Log:
MAPREDUCE-5191. TestQueue#testQueue fails with timeout on Windows. (Contributed 
by Ivan Mitic)

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1484575&r1=1484574&r2=1484575&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon May 20 
20:02:07 2013
@@ -141,6 +141,9 @@ Trunk (Unreleased)
     classpath problems and unexpected behavior of symlinks (Chris Nauroth via
     bikas)
 
+    MAPREDUCE-5191. TestQueue#testQueue fails with timeout on Windows. (Ivan
+    Mitic via hitesh)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS
 
     MAPREDUCE-4739. Some MapReduce tests fail to find winutils.

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java?rev=1484575&r1=1484574&r2=1484575&view=diff
==============================================================================
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
 Mon May 20 20:02:07 2013
@@ -28,8 +28,11 @@ import java.util.Iterator;
 import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.mapreduce.MRConfig;
 import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import static junit.framework.Assert.*;
@@ -39,6 +42,18 @@ import static org.mockito.Mockito.*;
  * TestCounters checks the sanity and recoverability of Queue
  */
 public class TestQueue {
+  private static File testDir = new File(System.getProperty("test.build.data",
+      "/tmp"), TestJobConf.class.getSimpleName());
+
+  @Before
+  public void setup() {
+    testDir.mkdirs();
+  }
+
+  @After
+  public void cleanup() {
+    FileUtil.fullyDelete(testDir);
+  }
 
   /**
    * test QueueManager
@@ -217,8 +232,7 @@ public class TestQueue {
  */
   private File writeFile() throws IOException {
 
-    File f = null;
-    f = File.createTempFile("tst", "xml");
+    File f = new File(testDir, "tst.xml");
     BufferedWriter out = new BufferedWriter(new FileWriter(f));
     String properties = "<properties><property key=\"key\" 
value=\"value\"/><property key=\"key1\" value=\"value1\"/></properties>";
     out.write("<queues>");