svn commit: r1407719 - /hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java

[ha...@apache.org]

Author: hashutosh
Date: Sat Nov 10 02:38:36 2012
New Revision: 1407719

URL: http://svn.apache.org/viewvc?rev=1407719&view=rev
Log:
HIVE-3659 : TestHiveHistory::testQueryloglocParentDirNotExist Test fails on Windows because of some resource leaks in ZK (Kanna Karanam via Ashutosh Chauhan)

Modified:
    hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java?rev=1407719&r1=1407718&r2=1407719&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java Sat Nov 10 02:38:36 2012
@@ -51,13 +51,10 @@ public class TestHiveHistory extends Tes
 
   static HiveConf conf;
 
-  private static String tmpdir = "/tmp/" + System.getProperty("user.name")
-      + "/";
+  private static String tmpdir = System.getProperty("test.tmp.dir");
   private static Path tmppath = new Path(tmpdir);
   private static Hive db;
   private static FileSystem fs;
-  private QTestSetup setup;
-
   /*
    * intialize the tables
    */
@@ -78,9 +75,8 @@ public class TestHiveHistory extends Tes
               + tmpdir);
         }
       }
-
-      setup = new QTestSetup();
-      setup.preTest(conf);
+      
+      conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
 
       // copy the test files into hadoop if required.
       int i = 0;
@@ -115,19 +111,6 @@ public class TestHiveHistory extends Tes
     }
   }
 
-  @Override
-  protected void tearDown() {
-    try {
-      setup.tearDown();
-    }
-    catch (Exception e) {
-      System.out.println("Exception: " + e.getMessage());
-      e.printStackTrace();
-      System.out.flush();
-      fail("Unexpected exception in tearDown");
-    }
-  }
-
   /**
    * Check history file output for this query.
    */