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/06/12 13:36:44 UTC
[1/3] falcon git commit: FALCON-1265 ListProcessInstancesTest test
fixes. Contributed by Raghav Kumar Gautam
Repository: falcon
Updated Branches:
refs/heads/master 8cbc33e0d -> c75653072
FALCON-1265 ListProcessInstancesTest test fixes. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/ec3e889a
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ec3e889a
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ec3e889a
Branch: refs/heads/master
Commit: ec3e889a755247d3e9ea83f8fc3096118647aa60
Parents: 8cbc33e
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Jun 12 14:31:28 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Fri Jun 12 14:31:28 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/lineage/ListProcessInstancesTest.java | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/ec3e889a/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index a1d77ab..58fedcc 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -351,6 +351,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1265 ListProcessInstancesTest test fixes (Raghav Kumar Gautam via Ruslan Ostafiychuk)
+
FALCON-1267 Fix Processsetuptest#testinoutstepdropdownfeeds (Namit Maheshwari via Raghav Kumar Gautam)
FALCON-1264 Fix validity parsing in ProcessWizardPage (Paul Isaychuk via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/ec3e889a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
index a28472b..f35e12d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
@@ -172,12 +172,12 @@ public class ListProcessInstancesTest extends BaseTestClass {
//use start option without numResults. 10 instances expected
r = prism.getProcessHelper().listInstances(processName, "start=" + startTime, null);
- InstanceUtil.validateResponse(r, 10, 1, 0, 9, 0);
+ InstanceUtil.validateResponse(r, 10, 3, 0, 7, 0);
//use start option with numResults value which is smaller then default.
r = prism.getProcessHelper().listInstances(processName,
"start=" + startTime + "&numResults=8", null);
- InstanceUtil.validateResponse(r, 8, 0, 0, 8, 0);
+ InstanceUtil.validateResponse(r, 8, 3, 0, 5, 0);
//use start option with numResults value greater then default. All 12 instances expected
r = prism.getProcessHelper().listInstances(processName,
@@ -242,6 +242,8 @@ public class ListProcessInstancesTest extends BaseTestClass {
InstanceUtil.validateResponse(r, 1, 0, 0, 0, 1);
//wait till new instances be RUNNING and total status count be stable
+ OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0, 3);
+ OozieUtil.createMissingDependencies(cluster, EntityType.PROCESS, processName, 0, 4);
InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 3,
CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 3);
@@ -300,7 +302,7 @@ public class ListProcessInstancesTest extends BaseTestClass {
//only start, actual startTime, should get 10 most recent instances
r = prism.getProcessHelper().listInstances(processName, "start=" + startTime, null);
- InstanceUtil.validateResponse(r, 10, 1, 0, 9, 0);
+ InstanceUtil.validateResponse(r, 10, 3, 0, 7, 0);
//only start, greater then actual startTime
r = prism.getProcessHelper().listInstances(processName,
[3/3] falcon git commit: FALCON-1270 SearchUI. Login screen changed
to not have password field. Contributed by Namit Maheshwari
Posted by ro...@apache.org.
FALCON-1270 SearchUI. Login screen changed to not have password field. 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/c7565307
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c7565307
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c7565307
Branch: refs/heads/master
Commit: c756530723b84d23fb931df38b0c5cd54e9c4aca
Parents: 5ec4c70
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Jun 12 14:36:06 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Fri Jun 12 14:36:06 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/ui/search/LoginPage.java | 23 ++------------------
.../falcon/regression/searchUI/LoginTest.java | 1 -
3 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/c7565307/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index eb08ba1..c54e142 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -351,6 +351,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1270 SearchUI. Login screen changed to not have password field (Namit Maheshwari via Ruslan Ostafiychuk)
+
FALCON-1266 LineageApiTest test fixes (Raghav Kumar Gautam via Ruslan Ostafiychuk)
FALCON-1265 ListProcessInstancesTest test fixes (Raghav Kumar Gautam via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/c7565307/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/LoginPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/LoginPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/LoginPage.java
index 3701d22..e292e44 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/LoginPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/LoginPage.java
@@ -31,8 +31,7 @@ import org.testng.Assert;
/** Page object for the Login Page. */
public class LoginPage extends AbstractSearchPage {
private static final Logger LOGGER = Logger.getLogger(LoginPage.class);
- public static final String UI_DEFAULT_USER = "ambari-qa";
- public static final String UI_DEFAULT_PASSWD = "admin";
+ public static final String UI_DEFAULT_USER = "hrt_qa";
public LoginPage(WebDriver driver) {
super(driver);
@@ -61,29 +60,13 @@ public class LoginPage extends AbstractSearchPage {
final WebElement userTextBox = getUserTextBox();
final WebElement userWarnLabel = getParentElement(userTextBox).findElement(
- By.xpath("//label[@class='custom-danger validationMessageGral']"));
+ By.xpath("//label[contains(@class, 'custom-danger') and contains(@class, 'validationMessageGral')]"));
if (userWarnLabel.isDisplayed()) {
return userWarnLabel.getText();
}
return "";
}
- private WebElement getPasswdTextBox() {
- return loginElem.findElement(By.xpath("//input[@name='password']"));
- }
-
- public void appendToPasswd(String text) {
- getPasswdTextBox().sendKeys(text);
- }
- public String getPasswdVisibleWarning() {
- final WebElement passwdWarnLabel = getParentElement(getPasswdTextBox()).findElements(
- By.xpath("//label[@class='custom-danger validationMessageGral']")).get(1);
- if (passwdWarnLabel.isDisplayed()) {
- return passwdWarnLabel.getText();
- }
- return "";
- }
-
/** Try to login by pressing the login button. */
public void tryLogin() {
LOGGER.info("Trying to login.");
@@ -95,9 +78,7 @@ public class LoginPage extends AbstractSearchPage {
/** Login successfully and take to the next page i.e. search page. */
public SearchPage doDefaultLogin() {
getUserTextBox().clear();
- getPasswdTextBox().clear();
appendToUserName(UI_DEFAULT_USER);
- appendToPasswd(UI_DEFAULT_PASSWD);
tryLogin();
LOGGER.info("Search page should have opened.");
final SearchPage searchPage = PageFactory.initElements(driver, SearchPage.class);
http://git-wip-us.apache.org/repos/asf/falcon/blob/c7565307/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/LoginTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/LoginTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/LoginTest.java
index a40fe20..d9fa35f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/LoginTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/LoginTest.java
@@ -93,7 +93,6 @@ public class LoginTest extends BaseUITestClass {
loginPage.tryLogin();
- Assert.assertEquals(loginPage.getPasswdVisibleWarning(), "Please enter your password.");
}
@Test
[2/3] falcon git commit: FALCON-1266 LineageApiTest test fixes.
Contributed by Raghav Kumar Gautam
Posted by ro...@apache.org.
FALCON-1266 LineageApiTest test fixes. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5ec4c708
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5ec4c708
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5ec4c708
Branch: refs/heads/master
Commit: 5ec4c708a3712894ef8c8678b637891d07570734
Parents: ec3e889
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Jun 12 14:33:46 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Fri Jun 12 14:33:46 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 +
.../regression/lineage/LineageApiTest.java | 73 ++++++++++----------
2 files changed, 40 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/5ec4c708/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 58fedcc..eb08ba1 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -351,6 +351,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1266 LineageApiTest test fixes (Raghav Kumar Gautam via Ruslan Ostafiychuk)
+
FALCON-1265 ListProcessInstancesTest test fixes (Raghav Kumar Gautam via Ruslan Ostafiychuk)
FALCON-1267 Fix Processsetuptest#testinoutstepdropdownfeeds (Namit Maheshwari via Raghav Kumar Gautam)
http://git-wip-us.apache.org/repos/asf/falcon/blob/5ec4c708/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
index ca3f2fa..5238b4e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
@@ -406,32 +406,33 @@ public class LineageApiTest extends BaseTestClass {
GraphAssert.assertEdgeSanity(bothEdges);
Assert.assertEquals(bothEdges.filterByType(Edge.LabelType.STORED_IN).size(),
inputFeeds.length + outputFeeds.length,
- "There should be edge between the cluster and inputFeeds, outputFeeds");
+ "Expecting edge between the cluster and inputFeeds, outputFeeds");
Assert.assertEquals(bothEdges.filterByType(Edge.LabelType.CLUSTER_COLO).size(),
- 1, "There should be an edge from the cluster to colo");
- Assert.assertEquals(bothEdges.getTotalSize(), inputFeeds.length + outputFeeds.length + 2,
- "There should be edge from the cluster to inputFeeds & outputFeeds,"
- + " one between cluster and colo, one between cluster and classification");
+ 1, "Expecting an edge from the cluster to colo");
+ Assert.assertEquals(bothEdges.getTotalSize(), inputFeeds.length + outputFeeds.length + 3,
+ "Expecting edge from the cluster to inputFeeds & outputFeeds,"
+ + "one between cluster and owner, one between cluster and colo and one between cluster and tags");
final EdgesResult inComingEdges =
lineageHelper.getEdgesByDirection(clusterVertexId, Direction.inComingEdges);
GraphAssert.assertEdgeSanity(inComingEdges);
Assert.assertEquals(inComingEdges.getTotalSize(), inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds");
+ "Expecting edge from the cluster to inputFeeds & outputFeeds");
Assert.assertEquals(inComingEdges.filterByType(Edge.LabelType.STORED_IN).size(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds");
+ "Expecting edge from the cluster to inputFeeds & outputFeeds");
final EdgesResult outGoingEdges =
lineageHelper.getEdgesByDirection(clusterVertexId, Direction.outGoingEdges);
GraphAssert.assertEdgeSanity(outGoingEdges);
Assert.assertEquals(outGoingEdges.filterByType(Edge.LabelType.CLUSTER_COLO).size(),
- 1, "There should be an edge from the cluster to colo");
+ 1, "Expecting an edge from the cluster to colo");
Assert.assertEquals(outGoingEdges.filterByType(Edge.LabelType.TESTNAME).size(),
- 1, "There should be an edge from the cluster to classification");
- Assert.assertEquals(outGoingEdges.getTotalSize(), 2,
- "There should be an edge from the cluster to colo");
+ 1, "Expecting an edge from the cluster to classification");
+ Assert.assertEquals(outGoingEdges.getTotalSize(), 3,
+ "Expecting one edge between cluster and owner, one between cluster and colo and "
+ + "one between cluster and tags");
}
@Test
@@ -443,23 +444,23 @@ public class LineageApiTest extends BaseTestClass {
GraphAssert.assertVertexSanity(bothVertices);
Assert.assertEquals(bothVertices.filterByType(Vertex.VERTEX_TYPE.FEED_ENTITY).size(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds");
+ "Expecting edge from the cluster to inputFeeds & outputFeeds");
Assert.assertEquals(bothVertices.filterByType(Vertex.VERTEX_TYPE.COLO).size(), 1,
"The should be one edge between cluster and colo");
Assert.assertEquals(bothVertices.getTotalSize(),
- inputFeeds.length + outputFeeds.length + 2,
- "There should be edge from the cluster to inputFeeds & outputFeeds,"
- + " one between cluster and colo, one between cluster and classification");
+ inputFeeds.length + outputFeeds.length + 3,
+ "Expecting edge from the cluster to inputFeeds & outputFeeds, "
+ + "one between cluster and owner, one between cluster and colo and one between cluster and tags");
final VerticesResult inComingVertices =
lineageHelper.getVerticesByDirection(clusterVertexId, Direction.inComingVertices);
GraphAssert.assertVertexSanity(inComingVertices);
Assert.assertEquals(inComingVertices.filterByType(Vertex.VERTEX_TYPE.FEED_ENTITY).size(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds");
+ "Expecting edge from the cluster to inputFeeds & outputFeeds");
Assert.assertEquals(inComingVertices.getTotalSize(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds and one "
+ "Expecting edge from the cluster to inputFeeds & outputFeeds and one "
+ "between cluster and colo");
final VerticesResult outgoingVertices =
@@ -468,9 +469,10 @@ public class LineageApiTest extends BaseTestClass {
Assert.assertEquals(outgoingVertices.filterByType(Vertex.VERTEX_TYPE.COLO).size(), 1,
"The should be one edge between cluster and colo");
Assert.assertEquals(outgoingVertices.filterByName(TEST_NAME).size(),
- 1, "There should be an edge from the cluster to classification");
- Assert.assertEquals(outgoingVertices.getTotalSize(), 2,
- "There should be an edge from the cluster to colo");
+ 1, "Expecting an edge from the cluster to classification");
+ Assert.assertEquals(outgoingVertices.getTotalSize(), 3,
+ "Expecting one edge between cluster and owner, one between cluster and colo and "
+ + "one between cluster and tags");
}
@Test
@@ -480,21 +482,22 @@ public class LineageApiTest extends BaseTestClass {
final VerticesResult bothCount =
lineageHelper.getVerticesByDirection(clusterVertexId, Direction.bothCount);
Assert.assertEquals(bothCount.getTotalSize(),
- inputFeeds.length + outputFeeds.length + 2,
- "There should be edge from the cluster to inputFeeds & outputFeeds,"
- + " one between cluster and colo, one between cluster and classification");
+ inputFeeds.length + outputFeeds.length + 1 + 2,
+ "Expecting edge from the cluster to inputFeeds & outputFeeds, "
+ + "one between cluster and owner, one between cluster and colo and one between cluster and tags");
final VerticesResult inCount =
lineageHelper.getVerticesByDirection(clusterVertexId, Direction.inCount);
Assert.assertEquals(inCount.getTotalSize(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds and one "
+ "Expecting edge from the cluster to inputFeeds & outputFeeds and one "
+ "between cluster and colo");
final VerticesResult outCount =
lineageHelper.getVerticesByDirection(clusterVertexId, Direction.outCount);
- Assert.assertEquals(outCount.getTotalSize(), 2,
- "There should be an edge from the cluster to colo");
+ Assert.assertEquals(outCount.getTotalSize(), 3,
+ "Expecting one edge between cluster and owner, one between cluster and "
+ + "colo and one between cluster and tags");
}
@Test
@@ -507,9 +510,9 @@ public class LineageApiTest extends BaseTestClass {
Assert.assertTrue(vertexId > 0, "Vertex id should be valid.");
}
Assert.assertEquals(bothVerticesIds.getTotalSize(),
- inputFeeds.length + outputFeeds.length + 2,
- "There should be edge from the cluster to inputFeeds & outputFeeds,"
- + " one between cluster and colo, one between cluster and classification");
+ inputFeeds.length + outputFeeds.length + 3,
+ "Expecting edge from the cluster to inputFeeds & outputFeeds,"
+ + " one between cluster and owner, one between cluster and colo and one between cluster and tags");
final VertexIdsResult incomingVerticesIds =
lineageHelper.getVertexIdsByDirection(clusterVertexId, Direction.incomingVerticesIds);
@@ -518,17 +521,17 @@ public class LineageApiTest extends BaseTestClass {
}
Assert.assertEquals(incomingVerticesIds.getTotalSize(),
inputFeeds.length + outputFeeds.length,
- "There should be edge from the cluster to inputFeeds & outputFeeds and one "
- + "between cluster and colo");
+ "Expecting edge from the cluster to inputFeeds & outputFeeds, "
+ + "one between cluster and owner, one between cluster and colo and one between cluster and tags");
final VertexIdsResult outgoingVerticesIds =
lineageHelper.getVertexIdsByDirection(clusterVertexId, Direction.outgoingVerticesIds);
for (Integer vertexId : outgoingVerticesIds.getResults()) {
Assert.assertTrue(vertexId > 0, "Vertex id should be valid.");
}
- Assert.assertEquals(outgoingVerticesIds.getTotalSize(), 2,
- "There should be an edge from the cluster to colo and one from cluster to "
- + "classification");
+ Assert.assertEquals(outgoingVerticesIds.getTotalSize(), 3,
+ "Expecting one edge between cluster and owner, one between cluster and colo and "
+ + "one between cluster and tags");
}
@Test
@@ -567,7 +570,7 @@ public class LineageApiTest extends BaseTestClass {
lineageHelper.getEdgesByDirection(clusterVertexId, Direction.outGoingEdges);
GraphAssert.assertEdgeSanity(outGoingEdges);
Assert.assertEquals(outGoingEdges.filterByType(Edge.LabelType.CLUSTER_COLO).size(),
- 1, "There should be an edge from the cluster to colo");
+ 1, "Expecting an edge from the cluster to colo");
final String clusterColoEdgeId =
outGoingEdges.filterByType(Edge.LabelType.CLUSTER_COLO).get(0).getId();