falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject [1/2] git commit: FALCON-855 Fix validation in ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame. Contributed by Ruslan Ostafiychuk
Date Wed, 05 Nov 2014 11:42:53 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 34533f285 -> 437109646


FALCON-855 Fix validation in ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame.
Contributed by Ruslan Ostafiychuk


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

Branch: refs/heads/master
Commit: 077f34f839f67e629682bb3a566875c6d9322d21
Parents: 34533f2
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Wed Nov 5 13:35:58 2014 +0200
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Wed Nov 5 13:35:58 2014 +0200

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                 | 3 +++
 .../apache/falcon/regression/ProcessInstanceKillsTest.java    | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/077f34f8/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 4ef0c24..8b88cce 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -129,6 +129,9 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-855 Fix validation in ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame
+   (Ruslan Ostafiychuk)
+
    FALCON-860 Add label-types for labels added as part of EntitySummaryTest (Raghav Kumar
Gautam
    via Ruslan Ostafiychuk)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/077f34f8/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
index aa9773c..17ffa64 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
@@ -112,9 +112,8 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
     }
 
     /**
-     * Schedule process. Check that in case when -start and -end parameters are equal -kill
-     * action results in the same way as in case with only -start parameter is used. Only
one
-     * instance should be killed. This test will fail because of https://issues.apache.org/jira/browse/FALCON-704
+     * Schedule process. Check that in case when -start and -end parameters are equal zero
+     * instances are killed.
      *
      * @throws Exception
      */
@@ -132,7 +131,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
                 CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5);
         InstancesResult r = prism.getProcessHelper()
                 .getProcessInstanceKill(processName, "?start=2010-01-02T00:03Z&end=2010-01-02T00:03Z");
-        InstanceUtil.validateResponse(r, 1, 0, 0, 0, 1);
+        Assert.assertNull(r.getInstances(), "There should be zero instances killed");
     }
 
     /**


Mime
View raw message