From 2dae44a607ece6b22b86858fc5f6993e41b640f8 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Fri, 19 Dec 2014 10:53:33 -0800 Subject: [PATCH] Disabling IIS variation test as CI machine does not have IIS installed. --- test/E2ETests/Common/DeploymentUtility.cs | 5 +++++ test/E2ETests/Common/IISApplication.cs | 3 +++ test/E2ETests/SmokeTests.cs | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/E2ETests/Common/DeploymentUtility.cs b/test/E2ETests/Common/DeploymentUtility.cs index be0a2b5737..c4b8f830f2 100644 --- a/test/E2ETests/Common/DeploymentUtility.cs +++ b/test/E2ETests/Common/DeploymentUtility.cs @@ -100,16 +100,19 @@ namespace E2ETests KpmPack(startParameters, Path.Combine(Environment.GetEnvironmentVariable("SystemDrive") + @"\", @"inetpub\wwwroot")); // Drop a Microsoft.AspNet.Hosting.ini with KRE_ENV information. + Console.WriteLine("Creating Microsoft.AspNet.Hosting.ini file with KRE_ENV."); var iniFile = Path.Combine(startParameters.ApplicationPath, "Microsoft.AspNet.Hosting.ini"); File.WriteAllText(iniFile, string.Format("KRE_ENV={0}", startParameters.EnvironmentName)); // Can't use localdb with IIS. Setting an override to use InMemoryStore. + Console.WriteLine("Creating configoverride.json file to override default config."); var overrideConfig = Path.Combine(startParameters.ApplicationPath, "..", "approot", "src", "MusicStore", "configoverride.json"); overrideConfig = Path.GetFullPath(overrideConfig); File.WriteAllText(overrideConfig, "{\"UseInMemoryStore\": \"true\"}"); if (startParameters.ServerType == ServerType.IISNativeModule) { + Console.WriteLine("Turning runAllManagedModulesForAllRequests=true in web.config."); // Set runAllManagedModulesForAllRequests=true var webConfig = Path.Combine(startParameters.ApplicationPath, "web.config"); var configuration = new XmlDocument(); @@ -126,6 +129,8 @@ namespace E2ETests configuration.Save(webConfig); } + Console.WriteLine("Successfully finished IIS application directory setup."); + Thread.Sleep(1 * 1000); } else diff --git a/test/E2ETests/Common/IISApplication.cs b/test/E2ETests/Common/IISApplication.cs index 26908fb9ba..38683c3147 100644 --- a/test/E2ETests/Common/IISApplication.cs +++ b/test/E2ETests/Common/IISApplication.cs @@ -55,17 +55,20 @@ namespace E2ETests applicationPool.ManagedRuntimeVersion = NATIVE_MODULE_MANAGED_RUNTIME_VERSION; } applicationPool.Enable32BitAppOnWin64 = (_startParameters.KreArchitecture == KreArchitecture.x86); + Console.WriteLine("Created {0} application pool '{1}' with runtime version '{2}'.", _startParameters.KreArchitecture, applicationPool.Name, applicationPool.ManagedRuntimeVersion ?? "default"); return applicationPool; } public void StopAndDeleteAppPool() { + Console.WriteLine("Stopping application pool '{0}' and deleting application.", _applicationPool.Name); _applicationPool.Stop(); // Remove the application from website. _application = Website.Applications.Where(a => a.Path == _application.Path).FirstOrDefault(); Website.Applications.Remove(_application); _serverManager.ApplicationPools.Remove(_serverManager.ApplicationPools[_applicationPool.Name]); _serverManager.CommitChanges(); + Console.WriteLine("Successfully stopped application pool '{0}' and deleted application from IIS.", _applicationPool.Name); } } } \ No newline at end of file diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index d5a06b910c..e8045f40f3 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -70,10 +70,10 @@ namespace E2ETests SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); } - [ConditionalTheory] + // [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Unix)] - [InlineData(ServerType.IISNativeModule, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] + [InlineData(ServerType.IIS, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] public void SmokeTestSuite_On_IIS_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) { SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl);