Cleanup log file tests (#1398)

test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
@@ -12,7 +11,7 @@ using Xunit;
 namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
 {
     [Collection(PublishedSitesCollection.Name)]
-    public class StartupExceptionTests : IISFunctionalTestBase
+    public class StartupExceptionTests : LogFileTestBase
     {
         private readonly PublishedSitesFixture _fixture;
 
@@ -22,18 +21,20 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalTheory]
-        [InlineData("ConsoleWrite")]
+        [InlineData("CheckLargeStdErrWrites")]
-        [InlineData("ConsoleErrorWrite")]
+        [InlineData("CheckLargeStdOutWrites")]
-        public async Task CheckStdoutWithRandomNumber(string mode)
+        [InlineData("CheckOversizedStdErrWrites")]
+        [InlineData("CheckOversizedStdOutWrites")]
+        public async Task CheckStdoutWithLargeWrites_TestSink(string mode)
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true);
+            deploymentParameters.TransformArguments((a, _) => $"{a} {mode}");
+            var deploymentResult = await DeployAsync(deploymentParameters);
 
-            var randomNumberString = new Random(Guid.NewGuid().GetHashCode()).Next(10000000).ToString();
+            await AssertFailsToStart(deploymentResult);
-            deploymentParameters.TransformArguments((a, _) => $"{a} {mode} {randomNumberString}");
+            var expectedString = new string('a', 30000);
-
+            Assert.Contains(TestSink.Writes, context => context.Message.Contains(expectedString));
-            await AssertFailsToStart(deploymentParameters);
+            EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString));
-
-            Assert.Contains(TestSink.Writes, context => context.Message.Contains($"Random number: {randomNumberString}"));
         }
 
         [ConditionalTheory]
@@ -41,14 +42,21 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         [InlineData("CheckLargeStdOutWrites")]
         [InlineData("CheckOversizedStdErrWrites")]
         [InlineData("CheckOversizedStdOutWrites")]
-        public async Task CheckStdoutWithLargeWrites(string mode)
+        public async Task CheckStdoutWithLargeWrites_LogFile(string mode)
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true);
             deploymentParameters.TransformArguments((a, _) => $"{a} {mode}");
+            deploymentParameters.EnableLogging(_logFolderPath);
 
-            await AssertFailsToStart(deploymentParameters);
+            var deploymentResult = await DeployAsync(deploymentParameters);
 
-            Assert.Contains(TestSink.Writes, context => context.Message.Contains(new string('a', 30000)));
+            await AssertFailsToStart(deploymentResult);
+
+            var contents = GetLogFileContent(deploymentResult);
+            var expectedString = new string('a', 30000);
+
+            Assert.Contains(expectedString, contents);
+            EventLogHelpers.VerifyEventLogEvent(deploymentResult, EventLogHelpers.InProcessThreadExitStdOut(deploymentResult, "12", expectedString));
         }
 
         [ConditionalFact]
@@ -57,16 +65,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(_fixture.InProcessTestSite, publish: true);
             deploymentParameters.TransformArguments((a, _) => $"{a} CheckConsoleFunctions");
 
-            await AssertFailsToStart(deploymentParameters);
+            var deploymentResult = await DeployAsync(deploymentParameters);
+
+            await AssertFailsToStart(deploymentResult);
 
             Assert.Contains(TestSink.Writes, context => context.Message.Contains("Is Console redirection: True"));
         }
 
-        private async Task AssertFailsToStart(IISDeploymentParameters deploymentParameters)
+        private async Task AssertFailsToStart(IISDeploymentResult deploymentResult)
         {
-            var deploymentResult = await DeployAsync(deploymentParameters);
+            var response = await deploymentResult.HttpClient.GetAsync("/HelloWorld");
-
-            var response = await deploymentResult.HttpClient.GetAsync("/");
 
             Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
 

test/Common.FunctionalTests/Utilities/LogFileTestBase.cs

@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
+using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities
+{
+    public class LogFileTestBase : IISFunctionalTestBase
+    {
+        protected string _logFolderPath;
+
+        public LogFileTestBase(ITestOutputHelper output = null) : base(output)
+        {
+            _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        }
+        public override void Dispose()
+        {
+            base.Dispose();
+            if (Directory.Exists(_logFolderPath))
+            {
+                Directory.Delete(_logFolderPath, true);
+            }
+        }
+
+        public string GetLogFileContent(IISDeploymentResult deploymentResult)
+        {
+            return File.ReadAllText(Helpers.GetExpectedLogName(deploymentResult, _logFolderPath));
+        }
+    }
+}

test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs

@@ -15,26 +15,15 @@ using Xunit;
 namespace IIS.FunctionalTests.Inprocess
 {
     [Collection(PublishedSitesCollection.Name)]
-    public class StdOutRedirectionTests : IISFunctionalTestBase
+    public class StdOutRedirectionTests : LogFileTestBase
     {
         private readonly PublishedSitesFixture _fixture;
-        private readonly string _logFolderPath;
 
         public StdOutRedirectionTests(PublishedSitesFixture fixture)
         {
-            _logFolderPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
             _fixture = fixture;
         }
 
-        public override void Dispose()
-        {
-            base.Dispose();
-            if (Directory.Exists(_logFolderPath))
-            {
-                Directory.Delete(_logFolderPath, true);
-            }
-        }
-
         [ConditionalFact]
         [SkipIfDebug]
         public async Task FrameworkNotFoundExceptionLogged_Pipe()