From 9070e12766195d32015f87c0b22a56bebd457846 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 28 Sep 2015 21:59:59 -0700
Subject: [PATCH] Reacting to Hosting changes

---
 test/E2ETests/Common/Helpers.cs           |  3 +-
 test/E2ETests/Implementation/Validator.cs |  4 +--
 test/E2ETests/SmokeTests.cs               | 41 +----------------------
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/test/E2ETests/Common/Helpers.cs b/test/E2ETests/Common/Helpers.cs
index c53734955f..68ea7154be 100644
--- a/test/E2ETests/Common/Helpers.cs
+++ b/test/E2ETests/Common/Helpers.cs
@@ -23,8 +23,7 @@ namespace E2ETests
 
         public static void SetInMemoryStoreForIIS(DeploymentParameters deploymentParameters, ILogger logger)
         {
-            if (deploymentParameters.ServerType == ServerType.IIS
-                || deploymentParameters.ServerType == ServerType.IISNativeModule)
+            if (deploymentParameters.ServerType == ServerType.IIS)
             {
                 // Can't use localdb with IIS. Setting an override to use InMemoryStore.
                 logger.LogInformation("Creating configoverride.json file to override default config.");
diff --git a/test/E2ETests/Implementation/Validator.cs b/test/E2ETests/Implementation/Validator.cs
index 13b0da92ee..d354a0080a 100644
--- a/test/E2ETests/Implementation/Validator.cs
+++ b/test/E2ETests/Implementation/Validator.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Server.Testing;
 using Microsoft.Framework.Logging;
@@ -126,8 +125,7 @@ namespace E2ETests
         private string PrefixBaseAddress(string url)
         {
 #if DNX451
-            url = (_deploymentResult.DeploymentParameters.ServerType == ServerType.IISNativeModule ||
-                _deploymentResult.DeploymentParameters.ServerType == ServerType.IIS) ?
+            url = _deploymentResult.DeploymentParameters.ServerType == ServerType.IIS ?
                 string.Format(url, new Uri(_deploymentResult.ApplicationBaseUri).Segments[1].TrimEnd('/')) :
                 string.Format(url, string.Empty);
 #else
diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs
index f0dbdda567..176dceb0d5 100644
--- a/test/E2ETests/SmokeTests.cs
+++ b/test/E2ETests/SmokeTests.cs
@@ -81,44 +81,6 @@ namespace E2ETests
         }
     }
 
-    public class SmokeTests_OnIIS_NativeModule
-    {
-        [ConditionalTheory, Trait("E2Etests", "E2Etests")]
-        [SkipIfIISNativeVariationsNotEnabled]
-        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
-        [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Linux)]
-        [SkipIfCurrentRuntimeIsCoreClr]
-        [InlineData(
-            ServerType.IISNativeModule, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "http://localhost:5011/")]
-        public async Task SmokeTestSuite_On_NativeModule_X86(
-            ServerType serverType,
-            RuntimeFlavor runtimeFlavor,
-            RuntimeArchitecture architecture,
-            string applicationBaseUrl)
-        {
-            var smokeTestRunner = new SmokeTests();
-            await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationBaseUrl);
-        }
-
-        [ConditionalTheory, Trait("E2Etests", "E2Etests")]
-        [SkipIfIISNativeVariationsNotEnabled]
-        [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
-        [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Linux)]
-        [SkipOn32BitOS]
-        [SkipIfCurrentRuntimeIsCoreClr]
-        [InlineData(
-            ServerType.IISNativeModule, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "http://localhost:5012/")]
-        public async Task SmokeTestSuite_On_NativeModule_AMD64(
-            ServerType serverType,
-            RuntimeFlavor runtimeFlavor,
-            RuntimeArchitecture architecture,
-            string applicationBaseUrl)
-        {
-            var smokeTestRunner = new SmokeTests();
-            await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationBaseUrl);
-        }
-    }
-
     public class SmokeTests_OnIIS
     {
         [ConditionalTheory, Trait("E2Etests", "E2Etests")]
@@ -166,8 +128,7 @@ namespace E2ETests
                     UserAdditionalCleanup = parameters =>
                     {
                         if (!Helpers.RunningOnMono
-                            && parameters.ServerType != ServerType.IIS
-                            && parameters.ServerType != ServerType.IISNativeModule)
+                            && parameters.ServerType != ServerType.IIS)
                         {
                             // Mono uses InMemoryStore
                             DbUtils.DropDatabase(musicStoreDbName, logger);