[oozie] branch master updated: OOZIE-3503 TestJavaActionExecutor.testSubmitWithLauncherQueue unit test failure (asalamon74 via kmarton)

[kmarton]

This is an automated email from the ASF dual-hosted git repository.

kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new e1e689d  OOZIE-3503 TestJavaActionExecutor.testSubmitWithLauncherQueue 
unit test failure (asalamon74 via kmarton)
e1e689d is described below

commit e1e689de693098713420c77ec5e81c1a916bf21e
Author: Julia Kinga Marton <kmar...@apache.org>
AuthorDate: Thu May 30 15:12:17 2019 +0200

    OOZIE-3503 TestJavaActionExecutor.testSubmitWithLauncherQueue unit test 
failure (asalamon74 via kmarton)
---
 .../java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java | 6 +++---
 release-log.txt                                                     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java 
b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
index ad9deac..62ce7fe 100644
--- 
a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
+++ 
b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
@@ -2187,7 +2187,7 @@ public class TestJavaActionExecutor extends 
ActionExecutorTestCase {
                 "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
                 "<name-node>" + getNameNodeUri() + "</name-node>" +
                 "<configuration>" +
-                "  
<property><name>oozie.launcher.queue</name><value>test</value></property>" +
+                "  
<property><name>oozie.launcher.queue</name><value>default1</value></property>" +
                 "</configuration>" +
                 "<main-class>" + LauncherMainTester.class.getName() + 
"</main-class>" +
                 "</java>";
@@ -2198,10 +2198,10 @@ public class TestJavaActionExecutor extends 
ActionExecutorTestCase {
         String queue = 
getHadoopAccessorService().createYarnClient(getTestUser(), 
conf).getApplicationReport(appId).getQueue();
 
         if (isFairSchedulerUsed(conf)) {
-            assertEquals("root.test", queue);
+            assertEquals("root.default1", queue);
         }
         else {
-            assertEquals("test", queue);
+            assertEquals("default1", queue);
         }
     }
 
diff --git a/release-log.txt b/release-log.txt
index 4c128e4..cb59058 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3503 TestJavaActionExecutor.testSubmitWithLauncherQueue unit test 
failure (asalamon74 via kmarton)
 OOZIE-3489 TestBulkWorkflowXCommand.testbulkWfKillSuccess is flaky (asalamon74 
via kmarton)
 OOZIE-3502 Use https when downloading dependencies (gezapeti)
 OOZIE-3490 [Java 11] Remove com.sun:tools dependency from core module (kmarton 
via asalamon74)