Author: rkanter
Date: Mon Feb 4 18:02:02 2013
New Revision: 1442234
URL: http://svn.apache.org/viewvc?rev=1442234&view=rev
Log:
OOZIE-1011 Tests from OOZIE-994 fail when run against Hadoop trunk (rkanter via
tucu)
Modified:
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/branches/branch-3.3/release-log.txt
Modified:
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1442234&r1=1442233&r2=1442234&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Mon Feb 4 18:02:02 2013
@@ -239,6 +239,10 @@ public class TestActionCheckXCommand ext
}
public void testActionCheckTransientDuringLauncher() throws Exception {
+ // When using YARN, skip this test because it relies on shutting down
the job tracker, which isn't used in YARN
+ if (createJobConf().get("yarn.resourcemanager.address") != null) {
+ return;
+ }
services.destroy();
// Make the ActionCheckXCommand run more frequently so the test won't
take as long
setSystemProperty("oozie.service.ActionCheckerService.action.check.interval",
"10");
@@ -345,6 +349,10 @@ public class TestActionCheckXCommand ext
}
public void testActionCheckTransientDuringMRAction() throws Exception {
+ // When using YARN, skip this test because it relies on shutting down
the job tracker, which isn't used in YARN
+ if (createJobConf().get("yarn.resourcemanager.address") != null) {
+ return;
+ }
services.destroy();
// Make the ActionCheckXCommand run more frequently so the test won't
take as long
setSystemProperty("oozie.service.ActionCheckerService.action.check.interval",
"10");
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442234&r1=1442233&r2=1442234&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 18:02:02 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1011 Tests from OOZIE-994 fail when run against Hadoop trunk (rkanter
via tucu)
OOZIE-1027 XTestCase.delete() can cause tests to fail if it runs into a
dangling symlink (rkanter via tucu)
OOZIE-1027 Command line mr does not support NN/JT parameters properly (Mona
via Mohammad)
OOZIE-1020 BulkJPAExecutor handling date-time value incorrectly.(Mona via
Mohammad)
