Repository: oozie Updated Branches: refs/heads/master ec70027da -> 741bb6781
OOZIE-2510 TestLogStreamer.testStreamLog() fails in other timezones (pbacsko via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/741bb678 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/741bb678 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/741bb678 Branch: refs/heads/master Commit: 741bb6781d2df1273e0501665aa8761c1cb33df5 Parents: ec70027 Author: Robert Kanter <[email protected]> Authored: Thu May 19 13:29:49 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Thu May 19 13:29:49 2016 -0700 ---------------------------------------------------------------------- core/src/test/java/org/apache/oozie/util/TestLogStreamer.java | 4 +++- release-log.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/741bb678/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java b/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java index 3f4dceb..f90f784 100644 --- a/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java +++ b/core/src/test/java/org/apache/oozie/util/TestLogStreamer.java @@ -149,7 +149,9 @@ public class TestLogStreamer extends XTestCase { xf.setLogLevel("DEBUG|INFO"); xf.setParameter("JOB", "14-200904160239--example-forkjoinwf"); XLogStreamer str = new XLogStreamer(xf, getTestCaseDir(), "oozie.log", 1); - str.streamLog(sw, DateUtils.parseDateOozieTZ("2009-06-24T02:43Z"), new Date(currTime - 5 * 3600000), 4096); + Calendar cal = Calendar.getInstance(); + cal.set(2009, Calendar.JUNE, 24, 2, 43, 0); + str.streamLog(sw, cal.getTime(), new Date(currTime - 5 * 3600000), 4096); String[] out = sw.toString().split("\n"); // Check if the retrieved log content is of length seven lines after filtering based on time window, file name // pattern and parameters like JobId, Username etc. and/or based on log level like INFO, DEBUG, etc. http://git-wip-us.apache.org/repos/asf/oozie/blob/741bb678/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 042a9f6..e69abc3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2510 TestLogStreamer.testStreamLog() fails in other timezones (pbacsko via rkanter) OOZIE-2531 Prevent Spark trying for token which is already available (satishsaley via rkanter) OOZIE-2509 SLA job status can stuck in running state (puru) OOZIE-2529 Support adding secret keys to Credentials of Launcher (satishsaley via rohini)
