Repository: falcon Updated Branches: refs/heads/master 05ee82e67 -> 5d6f957ca
FALCON-1241: Fix SearchApiTest according to changes in API, tag ClusterSetupTest, PrismProcessScheduleTest#testScheduleDeletedProcessOnBothColos contributed by Paul Isaychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5d6f957c Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5d6f957c Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5d6f957c Branch: refs/heads/master Commit: 5d6f957ca2dd9009e43eca2abe604ea25f4b8efb Parents: 05ee82e Author: Raghav Kumar Gautam <[email protected]> Authored: Wed May 27 14:16:29 2015 -0700 Committer: Raghav Kumar Gautam <[email protected]> Committed: Wed May 27 14:16:29 2015 -0700 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../falcon/regression/ui/search/AbstractSearchPage.java | 2 -- .../java/org/apache/falcon/regression/SearchApiTest.java | 8 ++++---- .../falcon/regression/prism/PrismProcessScheduleTest.java | 2 +- .../apache/falcon/regression/searchUI/ClusterSetupTest.java | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/5d6f957c/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 85fef51..27a4157 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -85,6 +85,9 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-1241 Fix SearchApiTest according to changes in API, tag ClusterSetupTest, + PrismProcessScheduleTest#testScheduleDeletedProcessOnBothColos (Paul Isaychuk) + FALCON-1226 Stabilize testActionsPauseResume() (Ruslan Ostafiychuk) FALCON-1225 remove text line containing "Copyright" from regression http://git-wip-us.apache.org/repos/asf/falcon/blob/5d6f957c/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/AbstractSearchPage.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/AbstractSearchPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/AbstractSearchPage.java index 0c054e4..780cd0c 100644 --- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/AbstractSearchPage.java +++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/AbstractSearchPage.java @@ -33,8 +33,6 @@ import org.openqa.selenium.support.ui.Select; import java.util.ArrayList; import java.util.List; -import java.util.List; - /** Parent page object for all the search ui pages. */ public abstract class AbstractSearchPage extends Page { http://git-wip-us.apache.org/repos/asf/falcon/blob/5d6f957c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/SearchApiTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/SearchApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/SearchApiTest.java index b317944..ff80a9d 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/SearchApiTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/SearchApiTest.java @@ -283,19 +283,19 @@ public class SearchApiTest extends BaseTestClass { {new QueryParams().forType("process").withNameSeq("bundle").withTagkey("bundle,b1b2").withNumResults(3) .withOrder(true).withSortOrder("desc"), new Result().withExpBundles(1, 2) .withExpTypes("process", "mirror").withExpTotal(3), }, - {new QueryParams().forType("schedulable").withNameSeq("bundle").withTagkey("partial,common") + {new QueryParams().forType("feed,process").withNameSeq("bundle").withTagkey("partial,common") .withOrder(true), new Result().withExpBundles(1, 2).withExpTypes("feed", "process", "mirror") .withExpTotal(6), }, {new QueryParams().forType("feed").withNameSeq("bundlefeed").withNumResults(2).withOrder(true) .withSortOrder("asc"), new Result().withExpBundles(0, 1, 2, 3) .withExpTypes("feed").withExpTotal(2), }, - {new QueryParams().forType("schedulable").withNameSeq("bundleproc").withTagkey("_falcon_mirroring_type") + {new QueryParams().forType("feed,process").withNameSeq("bundleproc").withTagkey("_falcon_mirroring_type") .withOrder(true).withSortOrder("desc"), new Result().withExpBundles(1, 2, 3) .withExpTypes("process", "mirror").withExpTotal(3), }, //one option excludes another {new QueryParams().forType("process").withNameSeq("bundlefeed"), new Result(), }, {new QueryParams().forType("feed").withNameSeq("bundleprocess"), new Result(), }, - {new QueryParams().forType("schedulable").withNameSeq("bundle3").withTagkey("b1b2").withOrder(true), + {new QueryParams().forType("feed,process").withNameSeq("bundle3").withTagkey("b1b2").withOrder(true), new Result(), }, }; } @@ -304,7 +304,7 @@ public class SearchApiTest extends BaseTestClass { * Contains all required params for search api request. */ private class QueryParams { - private String type = "schedulable"; + private String type = "feed,process"; private String nameSeq = null; private String tagKey = null; private String orderBy = null; http://git-wip-us.apache.org/repos/asf/falcon/blob/5d6f957c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java index c5bfdf1..3bfe284 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java @@ -174,7 +174,7 @@ public class PrismProcessScheduleTest extends BaseTestClass { * * @throws Exception */ - @Test(groups = {"prism", "0.2", "embedded"}) + @Test(groups = {"prism", "0.2", "distributed"}) public void testScheduleDeletedProcessOnBothColos() throws Exception { //schedule both bundles bundles[0].submitAndScheduleProcess(); http://git-wip-us.apache.org/repos/asf/falcon/blob/5d6f957c/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ClusterSetupTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ClusterSetupTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ClusterSetupTest.java index 95854ca..d616b84 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ClusterSetupTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/searchUI/ClusterSetupTest.java @@ -43,6 +43,7 @@ import java.util.List; /** * Tests for cluster setup page. */ +@Test(groups = "search-api") public class ClusterSetupTest extends BaseUITestClass{ private ClusterWizardPage clusterSetup = null; private ColoHelper cluster = servers.get(0);
