Repository: oozie Updated Branches: refs/heads/master 630868bc6 -> 3e99be048
OOZIE-2496 Testcase failure due to environment specific line.separator value (abhishekbafna via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3e99be04 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3e99be04 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3e99be04 Branch: refs/heads/master Commit: 3e99be048123d622d98027ba26dc489f4f91411d Parents: 630868b Author: Robert Kanter <rkan...@cloudera.com> Authored: Wed Aug 3 11:24:32 2016 -0700 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Wed Aug 3 11:24:32 2016 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/util/TimestampedMessageParser.java | 3 ++- .../test/java/org/apache/oozie/client/TestOozieCLI.java | 11 ++++++----- core/src/test/java/org/apache/oozie/test/XTestCase.java | 1 + .../apache/oozie/util/TestTimestampedMessageParser.java | 4 ++-- release-log.txt | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/3e99be04/core/src/main/java/org/apache/oozie/util/TimestampedMessageParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/TimestampedMessageParser.java b/core/src/main/java/org/apache/oozie/util/TimestampedMessageParser.java index f691409..a676f4d 100644 --- a/core/src/main/java/org/apache/oozie/util/TimestampedMessageParser.java +++ b/core/src/main/java/org/apache/oozie/util/TimestampedMessageParser.java @@ -37,6 +37,7 @@ import org.apache.oozie.service.XLogStreamingService; */ public class TimestampedMessageParser { + static final String SYSTEM_LINE_SEPARATOR = System.getProperty("line.separator"); protected BufferedReader reader; private String nextLine = null; private String lastTimestamp = null; @@ -85,7 +86,7 @@ public class TimestampedMessageParser { lastTimestamp = parseTimestamp(nextLine); String nextTimestamp = null; while (nextTimestamp == null) { - message.append(nextLine).append("\n"); + message.append(nextLine).append(SYSTEM_LINE_SEPARATOR); nextLine = parseNextLine(); if (nextLine != null) { nextTimestamp = parseTimestamp(nextLine); // exit loop if we have a timestamp, continue if not http://git-wip-us.apache.org/repos/asf/oozie/blob/3e99be04/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java index 6529bfa..10498cb 100644 --- a/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java +++ b/core/src/test/java/org/apache/oozie/client/TestOozieCLI.java @@ -954,11 +954,11 @@ public class TestOozieCLI extends DagServletTestCase { String oozieUrl = getContextURL(); String[] args = new String[]{"admin", "-status", "-oozie", oozieUrl}; String out = runOozieCLIAndGetStdout(args); - assertEquals("System mode: NORMAL\n", out); + assertEquals("System mode: NORMAL" + SYSTEM_LINE_SEPARATOR, out); args = new String[]{"admin", "-oozie", oozieUrl, "-systemmode", "NORMAL"}; out = runOozieCLIAndGetStdout(args); - assertEquals("System mode: NORMAL\n", out); + assertEquals("System mode: NORMAL" + SYSTEM_LINE_SEPARATOR, out); return null; } }); @@ -973,8 +973,8 @@ public class TestOozieCLI extends DagServletTestCase { String oozieUrl = getContextURL(); String[] args = new String[]{"admin", "-version", "-oozie", oozieUrl}; String out = runOozieCLIAndGetStdout(args); - assertEquals("Oozie server build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION)+ "\n", - out); + assertEquals("Oozie server build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION) + + SYSTEM_LINE_SEPARATOR, out); return null; } @@ -984,7 +984,8 @@ public class TestOozieCLI extends DagServletTestCase { public void testClientBuildVersion() throws Exception { String[] args = new String[]{"version"}; String out = runOozieCLIAndGetStdout(args); - assertEquals("Oozie client build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION) + "\n", out); + assertEquals("Oozie client build version: " + BuildInfo.getBuildInfo().getProperty(BuildInfo.BUILD_VERSION) + + SYSTEM_LINE_SEPARATOR, out); } public void testJobInfo() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/3e99be04/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index e360369..8ce44f3 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -112,6 +112,7 @@ public abstract class XTestCase extends TestCase { protected static File OOZIE_SRC_DIR = null; private static final String OOZIE_TEST_PROPERTIES = "oozie.test.properties"; + protected static final String SYSTEM_LINE_SEPARATOR = System.getProperty("line.separator"); public static float WAITFOR_RATIO = Float.parseFloat(System.getProperty("oozie.test.waitfor.ratio", "1")); protected static final String localActiveMQBroker = "vm://localhost?broker.persistent=false"; http://git-wip-us.apache.org/repos/asf/oozie/blob/3e99be04/core/src/test/java/org/apache/oozie/util/TestTimestampedMessageParser.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/util/TestTimestampedMessageParser.java b/core/src/test/java/org/apache/oozie/util/TestTimestampedMessageParser.java index 06af822..9e28cbc 100644 --- a/core/src/test/java/org/apache/oozie/util/TestTimestampedMessageParser.java +++ b/core/src/test/java/org/apache/oozie/util/TestTimestampedMessageParser.java @@ -197,9 +197,9 @@ public class TestTimestampedMessageParser extends XTestCase { XLogFilter.reset(); XLogFilter xf = new XLogFilter(); String str1 = "2009-06-24 02:43:13,958 DEBUG _L1_:323 - USER[oozie] GROUP[-] TOKEN[-] APP[example-forkjoinwf] " - + "JOB[14-200904160239--example-forkjoinwf] ACTION[-] End workflow state change\n"; + + "JOB[14-200904160239--example-forkjoinwf] ACTION[-] End workflow state change" + SYSTEM_LINE_SEPARATOR; String str2 = "2009-06-24 02:43:13,961 INFO _L2_:317 - USER[-] GROUP[-] TOKEN[-] APP[example-forkjoinwf] " - + "JOB[14-200904160239--example-forkjoinwf] ACTION[-]\n"; + + "JOB[14-200904160239--example-forkjoinwf] ACTION[-]" + SYSTEM_LINE_SEPARATOR; BufferedReader reader = new BufferedReader(new StringReader(str1 + str2)); TimestampedMessageParser parser = new TimestampedMessageParser(reader, xf); assertNull(parser.getLastMessage()); http://git-wip-us.apache.org/repos/asf/oozie/blob/3e99be04/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 62feaa6..5a76b2d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2496 Testcase failure due to environment specific line.separator value (abhishekbafna via rkanter) OOZIE-2574 Oozie to support replication-enabled mysql urls (abhishekbafna via rkanter) OOZIE-2433 oozie restart required if oozie metrics to graphing tool broken (nperiwal via jaydeepvishwakarma) OOZIE-2244 Oozie should mask passwords in the logs when logging command arguments (venkatnrangan via jaydeepvishwakarma)
