Index: ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (revision 1405070) +++ ql/src/test/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (working copy) @@ -51,13 +51,10 @@ 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,10 +75,9 @@ + tmpdir); } } + + conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false); - setup = new QTestSetup(); - setup.preTest(conf); - // copy the test files into hadoop if required. int i = 0; Path[] hadoopDataFile = new Path[2]; @@ -115,19 +111,6 @@ } } - @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. */