Repository: falcon Updated Branches: refs/heads/master 969dffee1 -> bc9c2cd31
FALCON-1553 Flaky test in SchedulerUtilTest (Balu Vellanki) Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/bc9c2cd3 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/bc9c2cd3 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/bc9c2cd3 Branch: refs/heads/master Commit: bc9c2cd3144406a0bd3c7b125c3b80d18842a9ac Parents: 969dffe Author: Pallavi Rao <[email protected]> Authored: Fri Oct 23 09:46:15 2015 +0530 Committer: Pallavi Rao <[email protected]> Committed: Fri Oct 23 09:46:15 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../java/org/apache/falcon/execution/SchedulerUtilTest.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/bc9c2cd3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4e25813..1ce124f 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,6 +14,8 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-1553 Flaky test in SchedulerUtilTest (Balu Vellanki via Pallavi Rao) + FALCON-1554 Fix Changes.txt after 0.8 branch cut(Sowmya Ramesh) Release version: 0.8 http://git-wip-us.apache.org/repos/asf/falcon/blob/bc9c2cd3/scheduler/src/test/java/org/apache/falcon/execution/SchedulerUtilTest.java ---------------------------------------------------------------------- diff --git a/scheduler/src/test/java/org/apache/falcon/execution/SchedulerUtilTest.java b/scheduler/src/test/java/org/apache/falcon/execution/SchedulerUtilTest.java index 9457454..768be7a 100644 --- a/scheduler/src/test/java/org/apache/falcon/execution/SchedulerUtilTest.java +++ b/scheduler/src/test/java/org/apache/falcon/execution/SchedulerUtilTest.java @@ -37,14 +37,14 @@ public class SchedulerUtilTest { @DataProvider(name = "frequencies") public Object[][] getTestFrequencies() { - DateTimeFormatter formatter = DateTimeFormat.forPattern("dd/MM/yyyy HH:mm:ss"); + DateTimeFormatter formatter = DateTimeFormat.forPattern("dd/MM/yyyy HH:mm:ss x"); return new Object[][] { {DateTime.now(), new Frequency("minutes(10)"), 10*60*1000L}, {DateTime.now(), new Frequency("hours(6)"), 6*60*60*1000L}, // Feb of leap year - {formatter.parseDateTime("04/02/2012 14:00:00"), new Frequency("months(1)"), 29*24*60*60*1000L}, + {formatter.parseDateTime("04/02/2012 14:00:00 -0800"), new Frequency("months(1)"), 29*24*60*60*1000L}, // Months with 31 and 30 days - {formatter.parseDateTime("02/10/2015 03:30:00"), new Frequency("months(2)"), (31+30)*24*60*60*1000L}, + {formatter.parseDateTime("02/10/2015 03:30:00 +0530"), new Frequency("months(2)"), (31+30)*24*60*60*1000L}, }; } }
