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 2016/10/10 11:52:45 UTC

[46/50] [abbrv] oozie git commit: amend OOZIE-1978 testForkJoinMismatch should pass on Java8

amend OOZIE-1978 testForkJoinMismatch should pass on Java8

Change-Id: I6847a876a5be876510aca916dc8b29b75850d5b3


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

Branch: refs/heads/oya
Commit: 8d2b49d424ca5dbe9c6c3c58e0a073e1f1336671
Parents: c49f382
Author: Peter Bacsko <pb...@cloudera.com>
Authored: Fri Sep 30 14:31:43 2016 +0200
Committer: Peter Bacsko <pb...@cloudera.com>
Committed: Fri Sep 30 14:31:43 2016 +0200

----------------------------------------------------------------------
 .../org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/8d2b49d4/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
index 6a9633b..0557166 100644
--- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
+++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java
@@ -1378,7 +1378,7 @@ public class TestLiteWorkflowAppParser extends XTestCase {
         } catch (WorkflowException we) {
             assertEquals(ErrorCode.E0757, we.getErrorCode());
             assertTrue(we.getMessage().contains("Fork node [f]"));
-            assertTrue(we.getMessage().contains("[j2,j1]"));
+            assertTrue(we.getMessage().contains("[j2,j1]") || we.getMessage().contains("[j1,j2]"));
         }
     }