Repository: incubator-falcon Updated Branches: refs/heads/master dc4d6170d -> 81904565a
FALCON-876 Reducing fail time for HCatProcessTest and PrismFeedReplicationUpdateTest. Contributed by Raghav Kumar Gautam Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/81904565 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/81904565 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/81904565 Branch: refs/heads/master Commit: 81904565a52684ae8824ea708709c19d19d332cf Parents: dc4d617 Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Fri Nov 7 17:35:33 2014 -0800 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Fri Nov 7 17:36:37 2014 -0800 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../falcon/regression/hcat/HCatProcessTest.java | 14 ++------------ .../prism/PrismFeedReplicationUpdateTest.java | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81904565/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index b4765aa..0136a27 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -138,6 +138,9 @@ Trunk (Unreleased) BUG FIXES + FALCON-876 Reducing fail time for HCatProcessTest and + PrismFeedReplicationUpdateTest (Raghav Kumar Gautam) + FALCON-873 BeforeClass fails in falcon-regression if "hadoop.rpc.protection" is not set(Samarth Gupta) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81904565/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java index 980b96f..66372e9 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java @@ -101,6 +101,8 @@ public class HCatProcessTest extends BaseTestClass { private static final String hcatDir = OSUtil.getPath("src", "test", "resources", "hcat"); private static final String localHCatData = OSUtil.getPath(hcatDir, "data"); private static final String hiveScript = OSUtil.getPath(hcatDir, "hivescript"); + final String startDate = "2010-01-01T20:00Z"; + final String endDate = "2010-01-01T21:10Z"; @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { @@ -133,8 +135,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void OneHCatInputOneHCatOutput(String separator) throws Exception { /* upload data and create partition */ - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); List<String> dataDates = getDatesList(startDate, endDate, datePattern, 60); @@ -195,8 +195,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void TwoHCatInputOneHCatOutput(String separator) throws Exception { /* upload data and create partition */ - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); List<String> dataDates = getDatesList(startDate, endDate, datePattern, 60); @@ -291,8 +289,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void OneHCatInputTwoHCatOutput(String separator) throws Exception { /* upload data and create partition */ - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); List<String> dataDates = getDatesList(startDate, endDate, datePattern, 60); @@ -373,8 +369,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void TwoHCatInputTwoHCatOutput(String separator) throws Exception { /* upload data and create partition */ - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); List<String> dataDates = getDatesList(startDate, endDate, datePattern, 60); @@ -489,8 +483,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void OneHCatInputOneNonHCatOutput(String separator) throws Exception { - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; /* upload data and create partition */ final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); @@ -554,8 +546,6 @@ public class HCatProcessTest extends BaseTestClass { @Test(dataProvider = "generateSeparators") public void OneNonCatInputOneHCatOutput(String separator) throws Exception { /* upload data and create partition */ - final String startDate = "2010-01-01T20:00Z"; - final String endDate = "2010-01-02T04:00Z"; final String datePattern = StringUtils.join(new String[]{"yyyy", "MM", "dd", "HH"}, separator); List<String> dataDates = getDatesList(startDate, endDate, datePattern, 60); http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/81904565/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java index 35c0975..63011b8 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java @@ -179,7 +179,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass { * * @throws Exception */ - @Test(enabled = true, timeOut = 3600000) + @Test(enabled = true, timeOut = 1800000) public void updateFeed_dependentProcessTest() throws Exception { //set cluster colos bundles[0].setCLusterColo(cluster1Colo);
