svn commit: r1402714 - in /oozie/trunk: core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java release-log.txt

[tu...@apache.org]

Author: tucu
Date: Fri Oct 26 23:29:01 2012
New Revision: 1402714

URL: http://svn.apache.org/viewvc?rev=1402714&view=rev
Log:
OOZIE-1011 Tests from OOZIE-994 fail when run against Hadoop trunk (rkanter via tucu)

Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1402714&r1=1402713&r2=1402714&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java Fri Oct 26 23:29:01 2012
@@ -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/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1402714&r1=1402713&r2=1402714&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Oct 26 23:29:01 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.4.0 release (trunk - 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)