svn commit: r1181323 - in /incubator/hcatalog/trunk: CHANGES.txt storage-drivers/hbase/build.xml storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java

[khorgath]

Author: khorgath
Date: Tue Oct 11 00:55:43 2011
New Revision: 1181323

URL: http://svn.apache.org/viewvc?rev=1181323&view=rev
Log:
HCATALOG-129 HBase Storage Driver Test doesn't use unique test dir for 
warehouse (toffer via khorgath)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
    
incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1181323&r1=1181322&r2=1181323&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Tue Oct 11 00:55:43 2011
@@ -23,6 +23,8 @@ Trunk (unreleased changes)
   INCOMPATIBLE CHANGES
 
   NEW FEATURES
+  HCAT-129. HBase Storage Driver Test doesn't use unique test dir for 
warehouse (toffer via khorgath)
+
   HCAT-109. HBase Storage Handler for HCatalog (avandana via khorgath)
 
   HCAT-119. Output Storage Driver for HBase (Bulk) and HBaseStorageDriver 
Composite class (toffer via khorgath)

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/build.xml?rev=1181323&r1=1181322&r2=1181323&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/build.xml Tue Oct 11 
00:55:43 2011
@@ -70,7 +70,6 @@
     <property name="test.all.file" value="${test.src.dir}/all-tests"/>
     <property name="test.exclude.file" value="${test.src.dir}/excluded-tests"/>
     <property name="test.output" value="no"/>
-    <property name="test.warehouse.dir" value="/tmp/hcat_junit_warehouse"/>
     <property name="hive.conf.dir" value="${hive.root}/conf"/>
 
     <!-- ivy properteis set here -->
@@ -242,12 +241,9 @@
 
             <delete dir="${test.log.dir}"/>
             <mkdir dir="${test.log.dir}"/>
-            <delete dir="${test.warehouse.dir}"/>
-            <mkdir dir="${test.warehouse.dir}"/>
             <junit showoutput="${test.output}" printsummary="yes" 
haltonfailure="no"
                    fork="yes" maxmemory="512m" dir="${basedir}" 
timeout="${test.timeout}"
                    errorProperty="tests.failed" failureProperty="tests.failed">
-                <sysproperty key="hive.metastore.warehouse.dir" 
value="${test.warehouse.dir}"/>
                 <classpath>
                     <pathelement location="${test.build.classes}" />
                     <pathelement location="." />

Modified: 
incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java?rev=1181323&r1=1181322&r2=1181323&view=diff
==============================================================================
--- 
incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
 (original)
+++ 
incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
 Tue Oct 11 00:55:43 2011
@@ -279,7 +279,10 @@ public class ManyMiniCluster {
         hiveConf.set(HiveConf.ConfVars.PREEXECHOOKS.varname, "");
         hiveConf.set(HiveConf.ConfVars.POSTEXECHOOKS.varname, "");
         hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, 
"false");
-        
hiveConf.set(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname,"jdbc:derby:"+workDir+"/metastore_db;create=true");
+        hiveConf.set(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname,
+                     "jdbc:derby:"+new 
File(workDir+"/metastore_db")+";create=true");
+        hiveConf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.toString(),
+                     new File(workDir,"warehouse").toString());
         //set where derby logs
         File derbyLogFile = new File(workDir+"/derby.log");
         derbyLogFile.createNewFile();