From aa3b20b76268ed0130fcf5dc03157537f6b007dc Mon Sep 17 00:00:00 2001
From: Inigo Goiri <inigoiri@apache.org>
Date: Wed, 23 May 2018 15:59:30 -0700
Subject: [PATCH] YARN-8327. Fix
 TestAggregatedLogFormat#testReadAcontainerLogs1 on Windows. Contributed by
 Giovanni Matteo Fumarola.

(cherry picked from commit f09dc73001fd5f3319765fa997f4b0ca9e8f2aff)
---
 .../TestAggregatedLogFormat.java              | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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 efbaa4c44c1..f85445ed68e 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"));