From ae7fae0bce61b23f7e62b34eaacc1ce040946bc4 Mon Sep 17 00:00:00 2001 From: Suhas Joshi Date: Thu, 24 Jul 2014 15:29:38 -0700 Subject: [PATCH] Formatted document and added bug numbers --- test/E2ETests/DeploymentUtility.cs | 6 +++--- test/E2ETests/SmokeTests.cs | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/test/E2ETests/DeploymentUtility.cs b/test/E2ETests/DeploymentUtility.cs index 7f1601d068..63f1538f5c 100644 --- a/test/E2ETests/DeploymentUtility.cs +++ b/test/E2ETests/DeploymentUtility.cs @@ -17,7 +17,7 @@ namespace E2ETests var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe"); // Get path to 64 bit of IIS Express - if(architecture == KreArchitecture.x64) + if (architecture == KreArchitecture.x64) { iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe"); @@ -57,7 +57,7 @@ namespace E2ETests { string applicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH)); //Tweak the %PATH% to the point to the right KREFLAVOR - Environment.SetEnvironmentVariable("PATH", SwitchPathToKreFlavor(kreFlavor,kreArchitecture)); + Environment.SetEnvironmentVariable("PATH", SwitchPathToKreFlavor(kreFlavor, kreArchitecture)); var backupKreDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB"); //To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty); @@ -116,7 +116,7 @@ namespace E2ETests return hostProcess; } - private static string SwitchPathToKreFlavor(KreFlavor kreFlavor,KreArchitecture kreArchitecture) + private static string SwitchPathToKreFlavor(KreFlavor kreFlavor, KreArchitecture kreArchitecture) { var pathValue = Environment.GetEnvironmentVariable("PATH"); Console.WriteLine(); diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index 45689f53b4..fc8dbbd598 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -22,9 +22,12 @@ namespace E2ETests [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")] [InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/")] [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/")] - [InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5001/")] [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x64, "http://localhost:5002/")] - [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5004/")] + // Uncomment Core CLR on x64 after following bugs are resolved + // https://github.com/aspnet/Identity/issues/157 + // https://github.com/aspnet/Mvc/issues/846 + //[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5001/")] + //[InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x64, "http://localhost:5004/")] public void SmokeTestSuite(ServerType hostType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) { Console.WriteLine("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", hostType, kreFlavor, architecture, applicationBaseUrl); @@ -32,9 +35,9 @@ namespace E2ETests // Check if processor architecture is x64, else ship test if (architecture == KreArchitecture.x64 && !Environment.Is64BitOperatingSystem) { - Console.WriteLine("Skipping x64 test since machine is of type x86"); - Assert.True(true); - return; + Console.WriteLine("Skipping x64 test since machine is of type x86"); + Assert.True(true); + return; } var testStartTime = DateTime.Now;