falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject falcon git commit: FALCON-1281 Fix InstancePageTest#testInstancePageStatusWaitingRunning. Contributed by Namit Maheshwari
Date Mon, 22 Jun 2015 12:58:41 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 3189d52e4 -> 460dd209a


FALCON-1281 Fix InstancePageTest#testInstancePageStatusWaitingRunning. Contributed by Namit
Maheshwari


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

Branch: refs/heads/master
Commit: 460dd209ab54471a93629c4d1590a02bbc671a65
Parents: 3189d52
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Mon Jun 22 15:55:59 2015 +0300
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Mon Jun 22 15:57:25 2015 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                      | 2 ++
 .../java/org/apache/falcon/regression/ui/search/InstancePage.java  | 2 +-
 .../org/apache/falcon/regression/searchUI/InstancePageTest.java    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/460dd209/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 654565c..4b56c37 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -355,6 +355,8 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-1281 Fix InstancePageTest#testInstancePageStatusWaitingRunning (Namit Maheshwari
via Ruslan Ostafiychuk)
+
    FALCON-1287 Use listAllEntities() instead of listEntities() (Ruslan Ostafiychuk via Paul
Isaychuk)
 
    FALCON-1288 Fortify expressionLanguageTest (Ruslan Ostafiychuk via Paul Isaychuk)

http://git-wip-us.apache.org/repos/asf/falcon/blob/460dd209/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/InstancePage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/InstancePage.java
b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/InstancePage.java
index d056539..48193a2 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/InstancePage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/InstancePage.java
@@ -44,7 +44,7 @@ public class InstancePage extends AbstractSearchPage {
         Resume,
         Rerun,
         Suspend,
-        Stop
+        Kill
     }
 
     public InstancePage(WebDriver driver) {

http://git-wip-us.apache.org/repos/asf/falcon/blob/460dd209/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/InstancePageTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/InstancePageTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/InstancePageTest.java
index dc21a27..9ec936d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/InstancePageTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/InstancePageTest.java
@@ -133,7 +133,7 @@ public class InstancePageTest extends BaseUITestClass {
         instancePage = searchPage.openEntityPage(processName).openInstance(instance);
         checkInstanceStatuses(InstancesResult.WorkflowStatus.RUNNING);
 
-        instancePage.clickButton(Button.Stop);
+        instancePage.clickButton(Button.Kill);
         checkInstanceStatuses(InstancesResult.WorkflowStatus.KILLED);
 
         Assert.assertEquals(instancePage.getButtons(true), EnumSet.of(Button.Rerun),


Mime
View raw message