Repository: falcon Updated Branches: refs/heads/master 8bbd6cfe7 -> ec0a4a82e
FALCON-1700 Add new test cases to HiveDRTest. Contributed by Paul Isaychuk & Murali Ramasami. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/ec0a4a82 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ec0a4a82 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ec0a4a82 Branch: refs/heads/master Commit: ec0a4a82e150b51e0a2a68c9d23bd2830405b605 Parents: 8bbd6cf Author: Ajay Yadava <[email protected]> Authored: Wed Dec 30 00:24:08 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Wed Dec 30 00:24:08 2015 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 1 + .../org/apache/falcon/regression/hive/dr/HiveDRTest.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/ec0a4a82/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 631c184..eb50a97 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -5,6 +5,7 @@ Trunk (Unreleased) INCOMPATIBLE CHANGES NEW FEATURES + FALCON-1700 Add new test cases to HiveDRTest(Paul Isaychuk & Murali Ramasami) FALCON-1689 NoOutputProcessTest fails due to scheme missing in workflow.xml(Pragya Mittal) http://git-wip-us.apache.org/repos/asf/falcon/blob/ec0a4a82/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hive/dr/HiveDRTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hive/dr/HiveDRTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hive/dr/HiveDRTest.java index bfc0d66..7660e04 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hive/dr/HiveDRTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hive/dr/HiveDRTest.java @@ -702,13 +702,18 @@ public class HiveDRTest extends BaseTestClass { CoordinatorJob.Timeunit timeUnit = job.getTimeUnit(); String freq = job.getFrequency(); LOGGER.info("Frequency of running job: " + timeUnit + " " + freq); - Assert.assertTrue(frequency.contains(timeUnit.name().toLowerCase().replace("_", "")) + String unit = timeUnit.name().toLowerCase().replace("_", ""); + if (frequency.contains("hours")) { + unit = "hours"; + freq = String.valueOf(Integer.parseInt(freq) / 60); + } + Assert.assertTrue(frequency.contains(unit) && frequency.contains(freq), "Running job has different frequency."); } @DataProvider(name = "frequencyGenerator") public Object[][] frequencyGenerator() { - return new Object[][]{{"minutes(10)"}, {"minutes(10000)"}, + return new Object[][]{{"minutes(10)"}, {"minutes(10000)"}, {"hours(5)"}, {"hours(5000)"}, {"days(3)"}, {"days(3000)"}, {"months(1)"}, {"months(1000)"}, }; }
