You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/05/20 10:57:14 UTC
falcon git commit: FALCON-1226 Stabilize testActionsPauseResume().
Contributed by Ruslan Ostafiychuk
Repository: falcon
Updated Branches:
refs/heads/master a57481417 -> ea30dc410
FALCON-1226 Stabilize testActionsPauseResume(). 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/ea30dc41
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ea30dc41
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ea30dc41
Branch: refs/heads/master
Commit: ea30dc410af56f1267af8c3e7b0a9b22f5bdfd80
Parents: a574814
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Wed May 20 11:52:08 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Wed May 20 11:54:53 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 1 +
.../apache/falcon/regression/ui/search/SearchPage.java | 4 +---
.../regression/searchUI/EntitiesTableReflectionTest.java | 10 +++++-----
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/ea30dc41/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index ccd7497..5e2d0f9 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -79,6 +79,7 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-1226 Stabilize testActionsPauseResume()
FALCON-1225 remove text line containing "Copyright" from regression
log4j.properties(Samarth Gupta)
http://git-wip-us.apache.org/repos/asf/falcon/blob/ea30dc41/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/SearchPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/SearchPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/SearchPage.java
index b1a7963..14f0d6c 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/SearchPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/SearchPage.java
@@ -22,7 +22,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.falcon.entity.v0.Entity;
import org.apache.falcon.regression.Entities.FeedMerlin;
import org.apache.falcon.regression.Entities.ProcessMerlin;
-import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.UIAssert;
import org.apache.log4j.Logger;
import org.openqa.selenium.By;
@@ -45,7 +44,6 @@ import java.util.Set;
public class SearchPage extends AbstractSearchPage {
private static final String CLASS_OF_SELECTED_ROW = "rowSelected";
- private static final int ANIMATION_DELAY = 2;
private static final Logger LOGGER = Logger.getLogger(SearchPage.class);
@@ -321,7 +319,7 @@ public class SearchPage extends AbstractSearchPage {
public void clickButton(Button button) {
resultBlock.findElement(By.className("buttonsRow"))
.findElements(By.className("btn")).get(button.ordinal()).click();
- TimeUtil.sleepSeconds(ANIMATION_DELAY);
+ waitForAngularToFinish();
}
/**
http://git-wip-us.apache.org/repos/asf/falcon/blob/ea30dc41/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntitiesTableReflectionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntitiesTableReflectionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntitiesTableReflectionTest.java
index cbad93a..f1ae7b4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntitiesTableReflectionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/EntitiesTableReflectionTest.java
@@ -154,7 +154,7 @@ public class EntitiesTableReflectionTest extends BaseUITestClass {
String secondProcess = processesMap.get(results.get(1).getEntityName());
Assert.assertEquals(results.get(0).getStatus(), EntityStatus.RUNNING,
- "Status of scheduled process should be RUNNING");
+ "Unexpected status after 'Schedule' was clicked");
Assert.assertTrue(prism.getProcessHelper().getStatus(firstProcess).getMessage()
.contains("RUNNING"), "First process should be RUNNING via API");
//select two processes
@@ -166,7 +166,7 @@ public class EntitiesTableReflectionTest extends BaseUITestClass {
searchPage.clickButton(Button.Schedule);
Assert.assertEquals(searchPage.getSearchResults().get(1).getStatus(), EntityStatus.RUNNING,
- "Status of scheduled process should be RUNNING");
+ "Unexpected status after 'Schedule' was clicked");
Assert.assertTrue(prism.getProcessHelper().getStatus(secondProcess).getMessage()
.contains("RUNNING"), "Second process should be RUNNING via API");
@@ -175,12 +175,12 @@ public class EntitiesTableReflectionTest extends BaseUITestClass {
searchPage.clickButton(Button.Suspend);
Assert.assertEquals(searchPage.getSearchResults().get(0).getStatus(), EntityStatus.SUSPENDED,
- "Status of scheduled process should be SUSPENDED");
+ "Unexpected status after 'Suspend' was clicked");
Assert.assertTrue(prism.getProcessHelper().getStatus(firstProcess).getMessage()
.contains("SUSPENDED"), "First process should be SUSPENDED via API");
- Assert.assertEquals(results.get(1).getStatus(), EntityStatus.SUSPENDED,
- "Status of scheduled process should be RUNNING");
+ Assert.assertEquals(searchPage.getSearchResults().get(1).getStatus(), EntityStatus.SUSPENDED,
+ "Unexpected status after 'Suspend' was clicked");
Assert.assertTrue(prism.getProcessHelper().getStatus(secondProcess).getMessage()
.contains("SUSPENDED"), "Second process should be SUSPENDED via API");