You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2017/06/16 19:36:58 UTC
oozie git commit: OOZIE-2950 TestOozieCLI.testSlaEvents is not
testing SLAServlet. (gezapeti)
Repository: oozie
Updated Branches:
refs/heads/master b03cde24d -> d22717a07
OOZIE-2950 TestOozieCLI.testSlaEvents is not testing SLAServlet. (gezapeti)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d22717a0
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d22717a0
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d22717a0
Branch: refs/heads/master
Commit: d22717a07a3614f7b79dd166a7afa79b5fe661c3
Parents: b03cde2
Author: Gezapeti Cseh <ge...@gmail.com>
Authored: Fri Jun 16 21:36:48 2017 +0200
Committer: Gezapeti Cseh <ge...@gmail.com>
Committed: Fri Jun 16 21:36:48 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/oozie/client/TestOozieCLI.java | 15 +++++++--------
release-log.txt | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/d22717a0/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
----------------------------------------------------------------------
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 9c7064b..26411aa 100644
--- a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
+++ b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java
@@ -43,6 +43,7 @@ import org.apache.oozie.service.ShareLibService;
import org.apache.oozie.servlet.DagServletTestCase;
import org.apache.oozie.servlet.MockCoordinatorEngineService;
import org.apache.oozie.servlet.MockDagEngineService;
+import org.apache.oozie.servlet.SLAServlet;
import org.apache.oozie.servlet.V1AdminServlet;
import org.apache.oozie.servlet.V1JobServlet;
import org.apache.oozie.servlet.V1JobsServlet;
@@ -63,14 +64,15 @@ public class TestOozieCLI extends DagServletTestCase {
new V2AdminServlet();
new V2JobServlet();
new V2ValidateServlet();
+ new SLAServlet();
}
static final boolean IS_SECURITY_ENABLED = false;
static final String VERSION = "/v" + OozieClient.WS_PROTOCOL_VERSION;
static final String[] END_POINTS = {"/versions", VERSION + "/jobs", VERSION + "/job/*", VERSION + "/admin/*",
- VERSION + "/validate/*"};
+ VERSION + "/validate/*", "/v1/sla"};
static final Class[] SERVLET_CLASSES = { HeaderTestingVersionServlet.class, V1JobsServlet.class,
- V2JobServlet.class, V2AdminServlet.class, V2ValidateServlet.class, V2JobServlet.class, V2AdminServlet.class};
+ V2JobServlet.class, V2AdminServlet.class, V2ValidateServlet.class, SLAServlet.class};
@Override
protected void setUp() throws Exception {
@@ -1317,19 +1319,16 @@ public class TestOozieCLI extends DagServletTestCase {
}
/**
- * Could not authenticate, Authentication failed, status: 404, message: Not Found
+ * Test response to sla list
*/
public void testSlaEvents() throws Exception {
runTest(END_POINTS, SERVLET_CLASSES, IS_SECURITY_ENABLED, new Callable<Void>() {
@Override
public Void call() throws Exception {
- Path appPath = new Path(getFsTestCaseDir(), "app");
- getFileSystem().mkdirs(appPath);
String oozieUrl = getContextURL();
String[] args = new String[] {"sla", "-oozie", oozieUrl, "-len", "1" };
-
- String out = runOozieCLIAndGetStderr(args);
- assertTrue(out.contains("Could not authenticate, Authentication failed, status: 404, message: Not Found"));
+ String out = runOozieCLIAndGetStdout(args);
+ assertTrue(out, out.contains("<sla-message>"));
return null;
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/d22717a0/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 4528ce7..7b65945 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.0.0 release (trunk - unreleased)
+OOZIE-2950 TestOozieCLI.testSlaEvents is not testing SLAServlet. (gezapeti)
OOZIE-2924 ./bin/mkdistro.sh reports a number instances of no @throws for Exception (Artem Ervits via gezapeti)
OOZIE-2928 Unit Tests using LocalOozie fail randomly (Denes Bodo via pbacsko)
OOZIE-2944 Shell action example does not work with Oozie on Yarn on hadoop 2.6 (asasvari via gezapeti)