You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2014/03/03 19:19:11 UTC
git commit: OOZIE-1711 TestLiteWorkflowAppParser fails against Hadoop
2 (rkanter)
Repository: oozie
Updated Branches:
refs/heads/master bf95aa354 -> 8a61ce193
OOZIE-1711 TestLiteWorkflowAppParser fails against Hadoop 2 (rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/8a61ce19
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/8a61ce19
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/8a61ce19
Branch: refs/heads/master
Commit: 8a61ce1935369eb2ab2718f9d9a443dfa293d8ff
Parents: bf95aa3
Author: Robert Kanter <rk...@cloudera.com>
Authored: Mon Mar 3 10:18:41 2014 -0800
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Mon Mar 3 10:18:41 2014 -0800
----------------------------------------------------------------------
.../apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java | 5 +++++
release-log.txt | 1 +
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/8a61ce19/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
index 6500e69..41e6205 100644
--- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
+++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
@@ -93,6 +93,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
" </configuration>\r\n" +
"</map-reduce>";
d = d.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
+ d = d.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2
assertEquals(expectedD.replaceAll(" ",""), d.replaceAll(" ", ""));
}
@@ -136,6 +137,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
" </configuration>\r\n" +
"</map-reduce>";
d = d.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
+ d = d.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2
assertEquals(expectedD.replaceAll(" ",""), d.replaceAll(" ", ""));
}
@@ -174,6 +176,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
" <name-node>bar</name-node>\r\n" +
"</pig>";
e = e.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
+ e = e.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2
assertEquals(expectedE.replaceAll(" ", ""), e.replaceAll(" ", ""));
}
@@ -215,6 +218,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
" <name-node>bar</name-node>\r\n" +
"</hive>";
a = a.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
+ a = a.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2
assertEquals(expectedA.replaceAll(" ",""), a.replaceAll(" ", ""));
}
@@ -250,6 +254,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
" <arg>/tmp2/data.txt</arg>\r\n" +
"</distcp>";
b = b.replaceAll(" xmlns=?(\"|\')(\"|\')", "");
+ b = b.replaceAll("\\s*<source>.*</source>", ""); // remove the <source> added by Hadoop 2
assertEquals(expectedB.replaceAll(" ",""), b.replaceAll(" ", ""));
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/8a61ce19/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index fa411e2..f6810bc 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1711 TestLiteWorkflowAppParser fails against Hadoop 2 (rkanter)
OOZIE-1714 Update Derby driver version to latest (rkanter)
OOZIE-1680 Add a check for a maximum frequency of 5 min on Coord jobs (rkanter)
OOZIE-1699 Some of the commands submitted to Oozie internal queue are never executed (sriksun via virag)