From bd18430428beba00f6dcebdd0a18e822a0214dd8 Mon Sep 17 00:00:00 2001
From: jhkimnew <jhkim@microsoft.com>
Date: Tue, 7 Nov 2017 16:43:23 -0800
Subject: [PATCH] Added StartupWithIStartupFilter (#236)

Added StartupWithIStartupFilter
---
 .../FunctionalTestHelper.cs                   |  1 +
 .../Program.cs                                | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs
index b35d93e745..d7381be4d1 100644
--- a/test/AspNetCoreModule.Test/FunctionalTestHelper.cs
+++ b/test/AspNetCoreModule.Test/FunctionalTestHelper.cs
@@ -718,6 +718,7 @@ namespace AspNetCoreModule.Test
                     if (!isGraceFullShutdownEnabled)
                     {
                         iisConfig.SetANCMConfig(testSite.SiteName, testSite.AspNetCoreApp.Name, "environmentVariable", new string[] { "GracefulShutdown", "disabled" });
+                        iisConfig.SetANCMConfig(testSite.SiteName, testSite.AspNetCoreApp.Name, "environmentVariable", new string[] { "ANCMTestStartupClassName", "StartupWithShutdownDisabled" });
                         expectedGracefulShutdownResponseStatusCode = "200";
                     }
 
diff --git a/test/AspNetCoreModule.TestSites.Standard/Program.cs b/test/AspNetCoreModule.TestSites.Standard/Program.cs
index f7e3a9483a..c7c10424c9 100644
--- a/test/AspNetCoreModule.TestSites.Standard/Program.cs
+++ b/test/AspNetCoreModule.TestSites.Standard/Program.cs
@@ -80,14 +80,9 @@ namespace AspnetCoreModule.TestSites.Standard
                         .UseIISIntegration()
                         .UseStartup<StartupNtlmAuthentication>();
                 }
-                else
+                else if (startUpClassString == "StartupWithShutdownDisabled")
                 {
-                    throw new System.Exception("Invalid startup class name : " + startUpClassString);
-                }
-            }
-            else
-            {
-                builder = new WebHostBuilder()
+                    builder = new WebHostBuilder()
                     .ConfigureServices(services =>
                     {
                         const string PairingToken = "TOKEN";
@@ -98,6 +93,18 @@ namespace AspnetCoreModule.TestSites.Standard
                     })
                     .UseConfiguration(config)
                     .UseStartup<Startup>();
+                }
+                else
+                {
+                    throw new Exception("Invalid startup class name : " + startUpClassString);
+                }
+            }
+            else
+            {
+                builder = new WebHostBuilder()
+                    .UseConfiguration(config)
+                    .UseIISIntegration()
+                    .UseStartup<Startup>();
             }
 
             string startupDelay = Environment.GetEnvironmentVariable("ANCMTestStartUpDelay");