oozie-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asasv...@apache.org
Subject oozie git commit: OOZIE-2746 Several tests failure in TestV2ValidateServlet.java (Dongying Jiao via asasvari)
Date Tue, 29 Aug 2017 12:32:00 GMT
Repository: oozie
Updated Branches:
  refs/heads/master 0601fc228 -> 7ebe9555b


OOZIE-2746 Several tests failure in TestV2ValidateServlet.java (Dongying Jiao via asasvari)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7ebe9555
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7ebe9555
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7ebe9555

Branch: refs/heads/master
Commit: 7ebe9555b71239eb5d32fb10ab4c92eb68ec39e6
Parents: 0601fc2
Author: Attila Sasvari <asasvari@cloudera.com>
Authored: Tue Aug 29 14:28:49 2017 +0200
Committer: Attila Sasvari <asasvari@cloudera.com>
Committed: Tue Aug 29 14:28:49 2017 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java | 2 +-
 .../test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java | 3 ++-
 release-log.txt                                                   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/7ebe9555/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java b/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
index 45bb1f0..7bf8fb3 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
@@ -122,7 +122,7 @@ public class V2ValidateServlet extends JsonRestServlet {
                 }
                 // Check the root element declaration(workflow-app, coordinator-app, bundle-app).
                 // If invalid, move to next schema validation.
-                if (!e.getMessage().contains("cvc-elt.1.a")) {
+                if (!e.getMessage().contains("cvc-elt.1")) {
                     exception = e;
                     break;
                 }

http://git-wip-us.apache.org/repos/asf/oozie/blob/7ebe9555/core/src/test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java
index 2eb6c01..384e28e 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV2ValidateServlet.java
@@ -557,7 +557,8 @@ public class TestV2ValidateServlet extends DagServletTestCase {
                 String error = conn.getHeaderField(RestConstants.OOZIE_ERROR_CODE);
                 String message = conn.getHeaderField(RestConstants.OOZIE_ERROR_MESSAGE);
                 assertEquals("E0701", error);
-                assertEquals(true, message.contains("cvc-elt.1.a: Cannot find the declaration
of element 'bundle-app-invalid"));
+                assertEquals(true, message.matches("^.*cvc-elt.1(.a)?: " +
+                        "Cannot find the declaration of element 'bundle-app-invalid'.*$"));
                 return null;
 
             }

http://git-wip-us.apache.org/repos/asf/oozie/blob/7ebe9555/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index c2b3683..43a5766 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2746 Several tests failure in TestV2ValidateServlet.java (Dongying Jiao via asasvari)
 OOZIE-3038 Make all Oozie JUnit tests pass on dist_test (andras.piros via gezapeti)
 OOZIE-2940 Possible NullPointerException in WorkflowActionBean (dionusos via gezapeti)
 OOZIE-3036 Spark 2.2.0 support: tell Spark not to get any delegation tokens (andras.piros
via gezapeti)


Mime
View raw message