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

svn commit: r1308578 - in /incubator/oozie/trunk: core/src/test/java/org/apache/oozie/test/XFsTestCase.java core/src/test/java/org/apache/oozie/test/XTestCase.java release-log.txt

Author: kamrul
Date: Mon Apr  2 21:28:19 2012
New Revision: 1308578

URL: http://svn.apache.org/viewvc?rev=1308578&view=rev
Log:
OOZIE-799: Testcases failing due to missing action-conf dir. (Virag via Mohammad)

Modified:
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java?rev=1308578&r1=1308577&r2=1308578&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java Mon Apr  2 21:28:19 2012
@@ -65,6 +65,7 @@ public abstract class XFsTestCase extend
 
 
         conf.set("oozie.service.HadoopAccessorService.hadoop.configurations", "*=hadoop-conf");
+        conf.set("oozie.service.HadoopAccessorService.action.configurations", "*=action-conf");
 
         has = new HadoopAccessorService();
         has.init(conf);

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1308578&r1=1308577&r2=1308578&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java Mon Apr  2 21:28:19 2012
@@ -255,6 +255,8 @@ public abstract class XTestCase extends 
 
         File hadoopConfDir = new File(testCaseConfDir, "hadoop-conf");
         hadoopConfDir.mkdir();
+        File actionConfDir = new File(testCaseConfDir, "action-conf");
+        actionConfDir.mkdir();
         source = new File(OOZIE_SRC_DIR, "core/src/test/resources/hadoop-config.xml");
         target = new File(hadoopConfDir, "hadoop-site.xml");
         IOUtils.copyStream(new FileInputStream(source), new FileOutputStream(target));

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1308578&r1=1308577&r2=1308578&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Apr  2 21:28:19 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-799: Testcases failing due to missing action-conf dir. (Virag via Mohammad)
 OOZIE-798 it would be nice to keep action specific configs in action-conf instead of hadoop-conf (rvs via tucu)
 OOZIE-790 default concurrency value is inconsistent between doc and implementation.(Mohammad)
 OOZIE-793 remove HiveMain check for HADOOP_HOME (tucu)