Repository: falcon Updated Branches: refs/heads/master fae479b22 -> 8ee6d45f0
FALCON-1255 Fix list of expected statuses in drop down on Entity Page. Contributed by Ruslan Ostafiychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8ee6d45f Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8ee6d45f Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8ee6d45f Branch: refs/heads/master Commit: 8ee6d45f0f695687c8646b626655f37dfd7602e8 Parents: fae479b Author: Ruslan Ostafiychuk <[email protected]> Authored: Thu Jun 4 16:49:32 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Thu Jun 4 17:57:31 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../java/org/apache/falcon/regression/ui/search/EntityPage.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/8ee6d45f/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 21ba9a5..d9af012 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -337,6 +337,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1255 Fix list of expected statuses in drop down on Entity Page (Ruslan Ostafiychuk) + FALCON-1246 Remove wrong parameter from update signature, delete related tests (Paul Isaychuk) FALCON-1221 RescheduleProcessInFinalStatesTest.checkNotFoundDefinition() needs to be case flexible http://git-wip-us.apache.org/repos/asf/falcon/blob/8ee6d45f/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java index 5dabc7c..6a71cab 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/EntityPage.java @@ -576,7 +576,7 @@ public class EntityPage extends AbstractSearchPage { public Select getStatusDropDown() { final WebElement statusBox = getSummaryHeadParts().get(4); assertEquals(statusBox.getText(), - "Status \nALL\nRUNNING\nSUCCEEDED\nSUSPENDED\nKILLED", + "Status \nALL\nRUNNING\nSUCCEEDED\nSUSPENDED\nWAITING\nKILLED", "Unexpected label in instance summary heading"); return new Select(statusBox.findElement(By.tagName("select"))); }
