This is an automated email from the ASF dual-hosted git repository. dionusos 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 3226b31 OOZIE-3659 oozieUrl ambiguous port number in TestOozieCLI.java (AlexaD via dionusos) 3226b31 is described below commit 3226b3135b2303388647bd44797476b27e4f0ca7 Author: Denes Bodo <dionu...@apache.org> AuthorDate: Tue Feb 22 09:58:46 2022 +0100 OOZIE-3659 oozieUrl ambiguous port number in TestOozieCLI.java (AlexaD via dionusos) --- core/src/test/java/org/apache/oozie/client/TestOozieCLI.java | 7 +++++-- release-log.txt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java index 708f7e9..1cde71e 100644 --- a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java +++ b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java @@ -84,6 +84,7 @@ public class TestOozieCLI extends DagServletTestCase { static final String VERSION = "/v" + OozieClient.WS_PROTOCOL_VERSION; static final String[] END_POINTS = {"/versions", VERSION + "/jobs", VERSION + "/job/*", VERSION + "/admin/*", VERSION + "/validate/*", "/v1/sla"}; + static final String INVALID_PORT = "11"; static final Class<?>[] SERVLET_CLASSES = { HeaderTestingVersionServlet.class, V1JobsServlet.class, V2JobServlet.class, V2AdminServlet.class, V2ValidateServlet.class, SLAServlet.class}; @@ -1508,7 +1509,8 @@ public class TestOozieCLI extends DagServletTestCase { @Override public Void call() throws Exception { HeaderTestingVersionServlet.OOZIE_HEADERS.clear(); - String oozieUrl = "http://localhost:11/oozie"; + // negative test with an invalid port to verify the no of retries in a timeout case + String oozieUrl = "http://localhost:" + INVALID_PORT + "/oozie"; String[] args = new String[] { "job", "-update", "aaa", "-dryrun", "-oozie", oozieUrl, "-debug" }; OozieCLI cli = new OozieCLI(); CLIParser parser = cli.getCLIParser(); @@ -1553,7 +1555,8 @@ public class TestOozieCLI extends DagServletTestCase { @Override public Void call() throws Exception { HeaderTestingVersionServlet.OOZIE_HEADERS.clear(); - String oozieUrl = "http://localhost:11/oozie"; + // negative test with an invalid port to verify the no of retries + String oozieUrl = "http://localhost:" + INVALID_PORT + "/oozie"; String[] args = new String[] { "job", "-update", "aaa", "-dryrun", "-oozie", oozieUrl, "-debug" }; OozieCLI cli = new OozieCLI() { protected void setRetryCount(OozieClient wc) { diff --git a/release-log.txt b/release-log.txt index db84383..5230d07 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.3.0 release (trunk - unreleased) +OOZIE-3659 oozieUrl ambiguous port number in TestOozieCLI.java (AlexaD via dionusos) OOZIE-3658 Fix TestJMSJobEventListener#testConnectionDrop flakiness again (dionusos via asalamon74) OOZIE-3646 Possible dead-lock in SignalXCommand (zuston via dionusos) OOZIE-3652 Oozie launcher should retry directory listing when NoSuchFileException occurs (aajisaka via dionusos)