falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject git commit: FALCON-779 ProcessInstanceStatusTest#testProcessInstanceStatusReverseDateRange fixed. Contributed by Paul Isaychuk
Date Tue, 07 Oct 2014 12:37:36 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 74b206319 -> 5c305434c


FALCON-779 ProcessInstanceStatusTest#testProcessInstanceStatusReverseDateRange fixed. Contributed
by Paul Isaychuk


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/5c305434
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/5c305434
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/5c305434

Branch: refs/heads/master
Commit: 5c305434c615b5e91b17d6e3918f7a47cf4551a8
Parents: 74b2063
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Tue Oct 7 15:36:41 2014 +0300
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Tue Oct 7 15:36:41 2014 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                   |  3 +++
 .../regression/core/util/InstanceUtil.java      | 28 +++++---------------
 2 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/5c305434/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 502e7f5..9c9a147 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -87,6 +87,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-779 ProcessInstanceStatusTest#testProcessInstanceStatusReverseDateRange fixed (Paul
+   Isaychuk via Ruslan Ostafiychuk)
+
    FALCON-776 Fixing PrismFeedUpdateTest and FeedInstanceStatus test issues (Raghav Kumar
Gautam
    via Ruslan Ostafiychuk)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/5c305434/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
index a7b4a01..d8bef69 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
@@ -154,30 +154,16 @@ public final class InstanceUtil {
             r.setStatusCode(ResponseKeys.PROCESS_NOT_FOUND);
             return r;
         } else if (jsonString.contains("Parameter start is empty")
-                ||
-                jsonString.contains("Unparseable date:")) {
+                || jsonString.contains("Unparseable date:")) {
             r.setStatusCode(ResponseKeys.UNPARSEABLE_DATE);
             return r;
         } else if (response.getStatusLine().getStatusCode() == 400
-                &&
-                jsonString.contains("(FEED) not found")) {
-            r.setStatusCode(400);
-            return r;
-        } else if (
-                (response.getStatusLine().getStatusCode() == 400
-                        &&
-                        jsonString.contains("is beforePROCESS  start"))
-                        ||
-                        response.getStatusLine().getStatusCode() == 400
-                                &&
-                                jsonString.contains("is after end date")
-                        || (response.getStatusLine().getStatusCode() == 400
-                        &&
-                        jsonString.contains("is after PROCESS's end"))
-                        ||
-                        (response.getStatusLine().getStatusCode() == 400
-                                &&
-                                jsonString.contains("is before PROCESS's  start"))) {
+            && (jsonString.contains("(FEED) not found")
+            || jsonString.contains("is beforePROCESS  start")
+            || jsonString.contains("is after end date")
+            || jsonString.contains("is after PROCESS's end"))
+            || jsonString.contains("is before PROCESS's  start")
+            || jsonString.contains("is before the entity was scheduled")) {
             r.setStatusCode(400);
             return r;
         }


Mime
View raw message