Repository: oozie Updated Branches: refs/heads/master 3e99be048 -> cd08523b1
OOZIE-2493 TestDistcpMain deletes action.xml from wrong filesystem (abhishekbafna via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/cd08523b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/cd08523b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/cd08523b Branch: refs/heads/master Commit: cd08523b16b4bdef1324a6ac278f266d1b001786 Parents: 3e99be0 Author: Robert Kanter <rkan...@cloudera.com> Authored: Wed Aug 3 13:46:15 2016 -0700 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Wed Aug 3 13:46:15 2016 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java | 4 ++-- release-log.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/cd08523b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java index 10c0e1c..098995e 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistcpMain.java @@ -82,7 +82,7 @@ public class TestDistcpMain extends MainTestCase { // test -D option jobConf.set("mapred.job.queue.name", "non-exist"); - fs.delete(new Path(getTestCaseDir(), "action.xml"), true); + new File(getTestCaseDir(), "action.xml").delete(); os = new FileOutputStream(actionXml); jobConf.writeXml(os); @@ -90,7 +90,7 @@ public class TestDistcpMain extends MainTestCase { String option = "-Dmapred.job.queue.name=default"; // overwrite queue setting DistcpMain.main(new String[] { option, inputDir.toString(), outputDir.toString() }); assertTrue(getFileSystem().exists(outputDir)); - + new File(getTestCaseDir(), "action.xml").delete(); return null; } } http://git-wip-us.apache.org/repos/asf/oozie/blob/cd08523b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5a76b2d..71c63f3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2493 TestDistcpMain deletes action.xml from wrong filesystem (abhishekbafna via rkanter) OOZIE-2496 Testcase failure due to environment specific line.separator value (abhishekbafna via rkanter) OOZIE-2574 Oozie to support replication-enabled mysql urls (abhishekbafna via rkanter) OOZIE-2433 oozie restart required if oozie metrics to graphing tool broken (nperiwal via jaydeepvishwakarma)