YARN-8327. Fix TestAggregatedLogFormat#testReadAcontainerLogs1 on Windows. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit f09dc73001fd5f3319765fa997f4b0ca9e8f2aff) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa8af4aa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa8af4aa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa8af4aa Branch: refs/heads/branch-3.1 Commit: fa8af4aab544d2aab37c5b0e8188ddeb57d3e97c Parents: 61b5b2f Author: Inigo Goiri <inigo...@apache.org> Authored: Wed May 23 15:59:30 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Wed May 23 15:59:59 2018 -0700 ---------------------------------------------------------------------- .../logaggregation/TestAggregatedLogFormat.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa8af4aa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java index efbaa4c..f85445e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/logaggregation/TestAggregatedLogFormat.java @@ -254,13 +254,18 @@ public class TestAggregatedLogFormat { // Since we could not open the fileInputStream for stderr, this file is not // aggregated. String s = writer.toString(); - int expectedLength = - "LogType:stdout".length() - + (logUploadedTime ? ("\nLog Upload Time:" + Times.format(System - .currentTimeMillis())).length() : 0) - + ("\nLogLength:" + numChars).length() - + "\nLog Contents:\n".length() + numChars + "\n".length() - + "\nEnd of LogType:stdout\n".length(); + + int expectedLength = "LogType:stdout".length() + + (logUploadedTime + ? (System.lineSeparator() + "Log Upload Time:" + + Times.format(System.currentTimeMillis())).length() + : 0) + + (System.lineSeparator() + "LogLength:" + numChars).length() + + (System.lineSeparator() + "Log Contents:" + System.lineSeparator()) + .length() + + numChars + ("\n").length() + ("End of LogType:stdout" + + System.lineSeparator() + System.lineSeparator()).length(); + Assert.assertTrue("LogType not matched", s.contains("LogType:stdout")); Assert.assertTrue("log file:stderr should not be aggregated.", !s.contains("LogType:stderr")); Assert.assertTrue("log file:logs should not be aggregated.", !s.contains("LogType:logs")); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
