You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/02/23 01:46:52 UTC

svn commit: r1292604 - in /incubator/oozie/trunk: core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java release-log.txt

Author: tucu
Date: Thu Feb 23 00:46:52 2012
New Revision: 1292604

URL: http://svn.apache.org/viewvc?rev=1292604&view=rev
Log:
OOZIE-712 Hive testcases fail with 0.23 (tucu)

Modified:
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java?rev=1292604&r1=1292603&r2=1292604&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java Thu Feb 23 00:46:52 2012
@@ -108,7 +108,7 @@ public class TestHiveActionExecutor exte
         "<configuration>" +
         "<property>" +
         "<name>javax.jdo.option.ConnectionURL</name>" +
-        "<value>jdbc:derby:db;create=true</value>" +
+        "<value>jdbc:derby:" + getTestCaseDir() + "/db;create=true</value>" +
         "</property>" +
         "<property>" +
         "<name>javax.jdo.option.ConnectionDriverName</name>" +

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java?rev=1292604&r1=1292603&r2=1292604&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java Thu Feb 23 00:46:52 2012
@@ -80,6 +80,7 @@ public class TestHiveMain extends MainTe
             w.close();
 
             XConfiguration jobConf = new XConfiguration();
+            jobConf.set("mapreduce.framework.name", "yarn");
 
             jobConf.set("oozie.hive.log.level", "DEBUG");
 
@@ -90,7 +91,7 @@ public class TestHiveMain extends MainTe
             jobConf.setInt("mapred.reduce.max.attempts", 1);
             jobConf.set("mapred.job.tracker", getJobTrackerUri());
             jobConf.set("fs.default.name", getNameNodeUri());
-            jobConf.set("javax.jdo.option.ConnectionURL", "jdbc:derby:db;create=true");
+            jobConf.set("javax.jdo.option.ConnectionURL", "jdbc:derby:" + getTestCaseDir() + "/db;create=true");
             jobConf.set("javax.jdo.option.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
             jobConf.set("javax.jdo.option.ConnectionUserName", "sa");
             jobConf.set("javax.jdo.option.ConnectionPassword", " ");

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1292604&r1=1292603&r2=1292604&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu Feb 23 00:46:52 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-712 Hive testcases fail with 0.23 (tucu)
 OOZIE-710 add a timeout to the surefire configuration (tucu)
 OOZIE-704 Sharelib action JARs for testcases should be collected leveraging Maven dependency information (tucu)
 OOZIE-703 Improve/Consolidate Hadoop job ID log harvesting logic (tucu)