From 14aebebbaaabc64cfd737e9d66225b735cf52276 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 21 Sep 2018 08:26:20 -0700
Subject: [PATCH] Remove using environment variables for specifying tests.
 (#1410)

---
 .../Inprocess/LogPipeTests.cs                 | 12 +++--
 test/Common.FunctionalTests/LogFileTests.cs   |  1 -
 test/WebSites/InProcessWebSite/Program.cs     | 44 ++++++++++---------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
index ed48204385..4d34c3154f 100644
--- a/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
+++ b/test/Common.FunctionalTests/Inprocess/LogPipeTests.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.IO;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
@@ -41,19 +40,19 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalTheory]
-        [InlineData("ConsoleErrorWrite")]
-        [InlineData("ConsoleWrite")]
+        [InlineData("ConsoleErrorWriteStartServer")]
+        [InlineData("ConsoleWriteStartServer")]
         public async Task CheckStdoutLoggingToPipeWithFirstWrite(string path)
         {
             var deploymentParameters = _fixture.GetBaseDeploymentParameters(publish: true);
 
-            var firstWriteString = path + path;
+            var firstWriteString = "TEST MESSAGE";
 
-            deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_INPROCESS_INITIAL_WRITE"] = firstWriteString;
+            deploymentParameters.TransformArguments((a, _) => $"{a} {path}");
 
             var deploymentResult = await DeployAsync(deploymentParameters);
 
-            await Helpers.AssertStarts(deploymentResult, path);
+            await Helpers.AssertStarts(deploymentResult);
 
             StopServer();
 
@@ -61,7 +60,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
             {
                 // We can't read stdout logs from IIS as they aren't redirected.
                 Assert.Contains(TestSink.Writes, context => context.Message.Contains(firstWriteString));
-                Assert.Contains(TestSink.Writes, context => context.Message.Contains("TEST MESSAGE"));
             }
         }
 
diff --git a/test/Common.FunctionalTests/LogFileTests.cs b/test/Common.FunctionalTests/LogFileTests.cs
index be8d8e700c..17f9def2d7 100644
--- a/test/Common.FunctionalTests/LogFileTests.cs
+++ b/test/Common.FunctionalTests/LogFileTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
diff --git a/test/WebSites/InProcessWebSite/Program.cs b/test/WebSites/InProcessWebSite/Program.cs
index f7abe535ae..43e9a563b2 100644
--- a/test/WebSites/InProcessWebSite/Program.cs
+++ b/test/WebSites/InProcessWebSite/Program.cs
@@ -79,31 +79,33 @@ namespace TestSite
                         host.Run();
                     }
                     break;
+                case "ConsoleErrorWriteStartServer":
+                    Console.Error.WriteLine("TEST MESSAGE");
+                    return StartServer();
+                case "ConsoleWriteStartServer":
+                    Console.WriteLine("TEST MESSAGE");
+                    return StartServer();
                 default:
-                    {
+                    return StartServer();
 
-                        var envVariable = Environment.GetEnvironmentVariable("ASPNETCORE_INPROCESS_INITIAL_WRITE");
-                        if (!string.IsNullOrEmpty(envVariable))
-                        {
-                            Console.WriteLine(envVariable);
-                            Console.Error.WriteLine(envVariable);
-                        }
-
-                        var host = new WebHostBuilder()
-                            .ConfigureLogging((_, factory) =>
-                            {
-                                factory.AddConsole();
-                                factory.AddFilter("Console", level => level >= LogLevel.Information);
-                            })
-                            .UseIIS()
-                            .UseStartup<Startup>()
-                            .Build();
-
-                        host.Run();
-                        return 0;
-                    }
             }
             return 12;
         }
+
+        private static int StartServer()
+        {
+            var host = new WebHostBuilder()
+                .ConfigureLogging((_, factory) =>
+                {
+                    factory.AddConsole();
+                    factory.AddFilter("Console", level => level >= LogLevel.Information);
+                })
+                .UseIIS()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+            return 0;
+        }
     }
 }