Author: tucu
Date: Wed Apr 4 18:27:13 2012
New Revision: 1309518
URL: http://svn.apache.org/viewvc?rev=1309518&view=rev
Log:
Merge -r 1309514:1309515 from trunk to branch. FIXES: OOZIE-802
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/test/XTestCase.java
incubator/oozie/branches/branch-3.2/release-log.txt
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1309518&r1=1309517&r2=1309518&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/test/XTestCase.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/test/XTestCase.java
Wed Apr 4 18:27:13 2012
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
+import java.io.OutputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.util.HashMap;
@@ -275,6 +276,13 @@ public abstract class XTestCase extends
System.setProperty("oozie.test.db.host", "localhost");
}
setSystemProperty(ConfigurationService.OOZIE_DATA_DIR, testCaseDir);
+
+ if (mrCluster != null) {
+ OutputStream os = new FileOutputStream(new File(hadoopConfDir,
"core-site.xml"));
+ Configuration conf = mrCluster.createJobConf();
+ conf.writeXml(os);
+ os.close();
+ }
}
/**
Modified: incubator/oozie/branches/branch-3.2/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/release-log.txt?rev=1309518&r1=1309517&r2=1309518&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.2/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.2/release-log.txt Wed Apr 4 18:27:13 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-802 Add minicluster config as hadoop-site.xml for testcases (tucu)
OOZIE-796 Making the maximum number of job retrials configurable (Mohamed via
Mohammad)
OOZIE-741: the size of the workflow definition file (Mohamed via Mohammad)
OOZIE-797 Action retry not reading default error code.(Mona via Mohammad)
