huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renaming KRE -> Dotnet

This commit is contained in:
Praburaj 2015-01-20 06:38:06 -08:00
parent eece81d67f
commit 71c171c052
8 changed files with 96 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
test/E2ETests/Common/DeploymentUtility.cs
View File

@ -15,13 +15,13 @@ namespace E2ETests
{ {
internal class DeploymentUtility internal class DeploymentUtility
{ {
private static string GetIISExpressPath(KreArchitecture architecture) private static string GetIISExpressPath(DotnetArchitecture architecture)
{ {
// Get path to program files // Get path to program files
var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe"); var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe");
// Get path to 64 bit of IIS Express // Get path to 64 bit of IIS Express
if (architecture == KreArchitecture.amd64) if (architecture == DotnetArchitecture.amd64)
{ {
iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe"); iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe");
@ -61,9 +61,9 @@ namespace E2ETests
{ {
startParameters.ApplicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH)); startParameters.ApplicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH));
//To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty //To avoid the DOTNET_DEFAULT_LIB of the test process flowing into Helios, set it to empty
var backupKreDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB"); var backupDotnetDefaultLibPath = Environment.GetEnvironmentVariable("DOTNET_DEFAULT_LIB");
Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty); Environment.SetEnvironmentVariable("DOTNET_DEFAULT_LIB", string.Empty);
if (!string.IsNullOrWhiteSpace(startParameters.EnvironmentName)) if (!string.IsNullOrWhiteSpace(startParameters.EnvironmentName))
{ {
@ -82,16 +82,16 @@ namespace E2ETests
Process hostProcess = null; Process hostProcess = null;
if (startParameters.KreFlavor == KreFlavor.Mono) if (startParameters.DotnetFlavor == DotnetFlavor.Mono)
{ {
hostProcess = StartMonoHost(startParameters, logger); hostProcess = StartMonoHost(startParameters, logger);
} }
else else
{ {
//Tweak the %PATH% to the point to the right KREFLAVOR //Tweak the %PATH% to the point to the right DOTNETFLAVOR
startParameters.Kre = SwitchPathToKreFlavor(startParameters.KreFlavor, startParameters.KreArchitecture, logger); startParameters.Dotnet = SwitchPathToDotnetFlavor(startParameters.DotnetFlavor, startParameters.DotnetArchitecture, logger);
//Reason to do pack here instead of in a common place is use the right KRE to do the packing. Previous line switches to use the right KRE. //Reason to do pack here instead of in a common place is use the right Dotnet to do the packing. Previous line switches to use the right Dotnet.
if (startParameters.PackApplicationBeforeStart) if (startParameters.PackApplicationBeforeStart)
{ {
if (startParameters.ServerType == ServerType.IISNativeModule || if (startParameters.ServerType == ServerType.IISNativeModule ||
@ -156,8 +156,8 @@ namespace E2ETests
} }
} }
//Restore the KRE_DEFAULT_LIB after starting the host process //Restore the DOTNET_DEFAULT_LIB after starting the host process
Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", backupKreDefaultLibPath); Environment.SetEnvironmentVariable("DOTNET_DEFAULT_LIB", backupDotnetDefaultLibPath);
Environment.SetEnvironmentVariable("ASPNET_ENV", string.Empty); Environment.SetEnvironmentVariable("ASPNET_ENV", string.Empty);
return hostProcess; return hostProcess;
} }
@ -165,27 +165,28 @@ namespace E2ETests
private static Process StartMonoHost(StartParameters startParameters, ILogger logger) private static Process StartMonoHost(StartParameters startParameters, ILogger logger)
{ {
var path = Environment.GetEnvironmentVariable("PATH"); var path = Environment.GetEnvironmentVariable("PATH");
var kreBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Where(c => c.Contains("KRE-Mono")).FirstOrDefault(); var dotnetBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).
Where(c => c.Contains("dotnet-mono")).FirstOrDefault();
if (string.IsNullOrWhiteSpace(kreBin)) if (string.IsNullOrWhiteSpace(dotnetBin))
{ {
throw new Exception("KRE not detected on the machine."); throw new Exception("Dotnet not detected on the machine.");
} }
if (startParameters.PackApplicationBeforeStart) if (startParameters.PackApplicationBeforeStart)
{ {
// We use full path to KRE to pack. // We use full path to Dotnet to pack.
startParameters.Kre = new DirectoryInfo(kreBin).Parent.FullName; startParameters.Dotnet = new DirectoryInfo(dotnetBin).Parent.FullName;
KpmPack(startParameters, logger); KpmPack(startParameters, logger);
} }
//Mono does not have a way to pass in a --appbase switch. So it will be an environment variable. //Mono does not have a way to pass in a --appbase switch. So it will be an environment variable.
Environment.SetEnvironmentVariable("KRE_APPBASE", startParameters.ApplicationPath); Environment.SetEnvironmentVariable("DOTNET_APPBASE", startParameters.ApplicationPath);
logger.WriteInformation("Setting the KRE_APPBASE to {0}", startParameters.ApplicationPath); logger.WriteInformation("Setting the DOTNET_APPBASE to {0}", startParameters.ApplicationPath);
var monoPath = "mono"; var monoPath = "mono";
var klrMonoManaged = Path.Combine(kreBin, "klr.mono.managed.dll"); var klrMonoManaged = Path.Combine(dotnetBin, "klr.mono.managed.dll");
var applicationHost = Path.Combine(kreBin, "Microsoft.Framework.ApplicationHost"); var applicationHost = Path.Combine(dotnetBin, "Microsoft.Framework.ApplicationHost");
var commandName = startParameters.ServerType == ServerType.Kestrel ? "kestrel" : string.Empty; var commandName = startParameters.ServerType == ServerType.Kestrel ? "kestrel" : string.Empty;
logger.WriteInformation(string.Format("Executing command: {0} {1} {2} {3}", monoPath, klrMonoManaged, applicationHost, commandName)); logger.WriteInformation(string.Format("Executing command: {0} {1} {2} {3}", monoPath, klrMonoManaged, applicationHost, commandName));
@ -204,7 +205,7 @@ namespace E2ETests
Thread.Sleep(25 * 1000); Thread.Sleep(25 * 1000);
//Clear the appbase so that it does not create issues with successive runs //Clear the appbase so that it does not create issues with successive runs
Environment.SetEnvironmentVariable("KRE_APPBASE", string.Empty); Environment.SetEnvironmentVariable("DOTNET_APPBASE", string.Empty);
return hostProcess; return hostProcess;
} }
@ -232,7 +233,7 @@ namespace E2ETests
string.Format("/port:5001 /path:{0}", startParameters.ApplicationPath) : string.Format("/port:5001 /path:{0}", startParameters.ApplicationPath) :
string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation); string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation);
var iisExpressPath = GetIISExpressPath(startParameters.KreArchitecture); var iisExpressPath = GetIISExpressPath(startParameters.DotnetArchitecture);
logger.WriteInformation("Executing command : {0} {1}", iisExpressPath, parameters); logger.WriteInformation("Executing command : {0} {1}", iisExpressPath, parameters);
@ -281,37 +282,38 @@ namespace E2ETests
return hostProcess; return hostProcess;
} }
private static string SwitchPathToKreFlavor(KreFlavor kreFlavor, KreArchitecture kreArchitecture, ILogger logger) private static string SwitchPathToDotnetFlavor(DotnetFlavor dotnetFlavor, DotnetArchitecture dotnetArchitecture, ILogger logger)
{ {
var pathValue = Environment.GetEnvironmentVariable("PATH"); var pathValue = Environment.GetEnvironmentVariable("PATH");
logger.WriteInformation(string.Empty); logger.WriteInformation(string.Empty);
logger.WriteInformation("Current %PATH% value : {0}", pathValue); logger.WriteInformation("Current %PATH% value : {0}", pathValue);
var replaceStr = new StringBuilder(). var replaceStr = new StringBuilder().
Append("KRE"). Append("dotnet").
Append((kreFlavor == KreFlavor.CoreClr) ? "-CoreCLR" : "-CLR"). Append((dotnetFlavor == DotnetFlavor.CoreClr) ? "-CoreCLR" : "-CLR").
Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-amd64"). Append("win").
Append((dotnetArchitecture == DotnetArchitecture.x86) ? "-x86" : "-x64").
ToString(); ToString();
pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)-(x86|amd64)", replaceStr, RegexOptions.IgnoreCase); pathValue = Regex.Replace(pathValue, "dotnet-(clr|coreclr)-win-(x86|x64)", replaceStr, RegexOptions.IgnoreCase);
var startIndex = pathValue.IndexOf(replaceStr); // First instance of this KRE name. var startIndex = pathValue.IndexOf(replaceStr); // First instance of this Dotnet name.
var kreName = pathValue.Substring(startIndex, pathValue.IndexOf(';', startIndex) - startIndex); var dotnetName = pathValue.Substring(startIndex, pathValue.IndexOf(';', startIndex) - startIndex);
kreName = kreName.Substring(0, kreName.IndexOf('\\')); // Trim the \bin from the path. dotnetName = dotnetName.Substring(0, dotnetName.IndexOf('\\')); // Trim the \bin from the path.
// Tweak the %PATH% to the point to the right KREFLAVOR. // Tweak the %PATH% to the point to the right DOTNETFLAVOR.
Environment.SetEnvironmentVariable("PATH", pathValue); Environment.SetEnvironmentVariable("PATH", pathValue);
logger.WriteInformation(string.Empty); logger.WriteInformation(string.Empty);
logger.WriteInformation("Changing to use KRE : {0}", kreName); logger.WriteInformation("Changing to use DOTNET : {0}", dotnetName);
return kreName; return dotnetName;
} }
private static void KpmPack(StartParameters startParameters, ILogger logger, string packRoot = null) private static void KpmPack(StartParameters startParameters, ILogger logger, string packRoot = null)
{ {
startParameters.PackedApplicationRootPath = Path.Combine(packRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString()); startParameters.PackedApplicationRootPath = Path.Combine(packRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString());
var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.Kre); var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.Dotnet);
logger.WriteInformation("Executing command kpm {0}", parameters); logger.WriteInformation("Executing command kpm {0}", parameters);
var startInfo = new ProcessStartInfo var startInfo = new ProcessStartInfo

2
test/E2ETests/Common/KreArchitecture.cs → test/E2ETests/Common/DotnetArchitecture.cs
View File

@ -1,6 +1,6 @@
namespace E2ETests namespace E2ETests
{ {
public enum KreArchitecture public enum DotnetArchitecture
{ {
amd64, amd64,
x86 x86

2
test/E2ETests/Common/KreFlavor.cs → test/E2ETests/Common/DotnetFlavor.cs
View File

@ -1,6 +1,6 @@
namespace E2ETests namespace E2ETests
{ {
public enum KreFlavor public enum DotnetFlavor
{ {
DesktopClr, DesktopClr,
CoreClr, CoreClr,

4
test/E2ETests/Common/IISApplication.cs
View File

@ -57,9 +57,9 @@ namespace E2ETests
// Not assigning a runtime version will choose v4.0 default. // Not assigning a runtime version will choose v4.0 default.
applicationPool.ManagedRuntimeVersion = NATIVE_MODULE_MANAGED_RUNTIME_VERSION; applicationPool.ManagedRuntimeVersion = NATIVE_MODULE_MANAGED_RUNTIME_VERSION;
} }
applicationPool.Enable32BitAppOnWin64 = (_startParameters.KreArchitecture == KreArchitecture.x86); applicationPool.Enable32BitAppOnWin64 = (_startParameters.DotnetArchitecture == DotnetArchitecture.x86);
_logger.WriteInformation("Created {0} application pool '{1}' with runtime version '{2}'.", _logger.WriteInformation("Created {0} application pool '{1}' with runtime version '{2}'.",
_startParameters.KreArchitecture, applicationPool.Name, _startParameters.DotnetArchitecture, applicationPool.Name,
applicationPool.ManagedRuntimeVersion ?? "default"); applicationPool.ManagedRuntimeVersion ?? "default");
return applicationPool; return applicationPool;
} }

6
test/E2ETests/Common/StartParameters.cs
View File

@ -7,9 +7,9 @@
{ {
public ServerType ServerType { get; set; } public ServerType ServerType { get; set; }
public KreFlavor KreFlavor { get; set; } public DotnetFlavor DotnetFlavor { get; set; }
public KreArchitecture KreArchitecture { get; set; } public DotnetArchitecture DotnetArchitecture { get; set; }
public string EnvironmentName { get; set; } public string EnvironmentName { get; set; }
@ -25,7 +25,7 @@
public string PackedApplicationRootPath { get; set; } public string PackedApplicationRootPath { get; set; }
public string Kre { get; set; } public string Dotnet { get; set; }
public IISApplication IISApplication { get; set; } public IISApplication IISApplication { get; set; }
} }

16
test/E2ETests/NtlmAuthentationTest.cs
View File

@ -12,21 +12,21 @@ namespace E2ETests
{ {
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Unix | OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.Unix | OperatingSystems.MacOSX)]
[InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5001/")]
[InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5001/")]
[InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5002/")] [InlineData(ServerType.WebListener, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5002/")]
public void NtlmAuthenticationTest(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void NtlmAuthenticationTest(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
using (_logger.BeginScope("NtlmAuthenticationTest")) using (_logger.BeginScope("NtlmAuthenticationTest"))
{ {
_logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", _logger.WriteInformation("Variation Details : HostType = {0}, DotnetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}",
serverType, kreFlavor, architecture, applicationBaseUrl); serverType, dotnetFlavor, architecture, applicationBaseUrl);
_startParameters = new StartParameters _startParameters = new StartParameters
{ {
ServerType = serverType, ServerType = serverType,
KreFlavor = kreFlavor, DotnetFlavor = dotnetFlavor,
KreArchitecture = architecture, DotnetArchitecture = architecture,
EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication'
ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null, ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null,
SiteName = "MusicStoreNtlmAuthentication" //This is configured in the NtlmAuthentication.config SiteName = "MusicStoreNtlmAuthentication" //This is configured in the NtlmAuthentication.config

30
test/E2ETests/PublishAndRunTests.cs
View File

@ -12,42 +12,42 @@ namespace E2ETests
{ {
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5001/")]
public void Publish_And_Run_Tests_On_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void Publish_And_Run_Tests_On_X86(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.DotNet)] [FrameworkSkipCondition(RuntimeFrameworks.DotNet)]
[InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/")] [InlineData(ServerType.Kestrel, DotnetFlavor.Mono, DotnetArchitecture.x86, "http://localhost:5004/")]
public void Publish_And_Run_Tests_On_Mono(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void Publish_And_Run_Tests_On_Mono(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/")] [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5002/")]
//https://github.com/aspnet/KRuntime/issues/642 //https://github.com/aspnet/KRuntime/issues/642
//[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/")] //[InlineData(ServerType.Helios, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5001/")]
public void Publish_And_Run_Tests_On_AMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void Publish_And_Run_Tests_On_AMD64(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl);
} }
private void Publish_And_Run_Tests(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) private void Publish_And_Run_Tests(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
using (_logger.BeginScope("Publish_And_Run_Tests")) using (_logger.BeginScope("Publish_And_Run_Tests"))
{ {
_logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", _logger.WriteInformation("Variation Details : HostType = {0}, DotnetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}",
serverType, kreFlavor, architecture, applicationBaseUrl); serverType, dotnetFlavor, architecture, applicationBaseUrl);
_startParameters = new StartParameters _startParameters = new StartParameters
{ {
ServerType = serverType, ServerType = serverType,
KreFlavor = kreFlavor, DotnetFlavor = dotnetFlavor,
KreArchitecture = architecture, DotnetArchitecture = architecture,
PackApplicationBeforeStart = true PackApplicationBeforeStart = true
}; };

60
test/E2ETests/SmokeTests.cs
View File

@ -27,44 +27,44 @@ namespace E2ETests
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5001/")]
[InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5002/")] [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5002/")]
[InlineData(ServerType.Kestrel, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5004/")] [InlineData(ServerType.Kestrel, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5004/")]
[InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5001/")]
[InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/")] [InlineData(ServerType.WebListener, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5002/")]
[InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/")] [InlineData(ServerType.Kestrel, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5004/")]
public void SmokeTestSuite_OnX86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_OnX86(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, dotnetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[SkipOn32BitOS] [SkipOn32BitOS]
[InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/")] [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5002/")]
[InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/")] [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5001/")]
[InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5004/")] [InlineData(ServerType.Kestrel, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5004/")]
public void SmokeTestSuite_OnAMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_OnAMD64(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.DotNet)] [FrameworkSkipCondition(RuntimeFrameworks.DotNet)]
[InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/")] [InlineData(ServerType.Kestrel, DotnetFlavor.Mono, DotnetArchitecture.x86, "http://localhost:5004/")]
public void SmokeTestSuite_OnMono(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_OnMono(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
[SkipIfNativeModuleNotInstalled] [SkipIfNativeModuleNotInstalled]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)] [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)]
[InlineData(ServerType.IISNativeModule, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] [InlineData(ServerType.IISNativeModule, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5005/")]
public void SmokeTestSuite_On_NativeModule_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_On_NativeModule_X86(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl);
} }
[ConditionalTheory] [ConditionalTheory]
@ -72,33 +72,33 @@ namespace E2ETests
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)] [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)]
[SkipOn32BitOS] [SkipOn32BitOS]
[InlineData(ServerType.IISNativeModule, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5005/")] [InlineData(ServerType.IISNativeModule, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5005/")]
public void SmokeTestSuite_On_NativeModule_AMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_On_NativeModule_AMD64(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl);
} }
// [ConditionalTheory] // [ConditionalTheory]
[FrameworkSkipCondition(RuntimeFrameworks.Mono)] [FrameworkSkipCondition(RuntimeFrameworks.Mono)]
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Unix)] [OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Unix)]
[InlineData(ServerType.IIS, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] [InlineData(ServerType.IIS, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5005/")]
public void SmokeTestSuite_On_IIS_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) public void SmokeTestSuite_On_IIS_X86(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl);
} }
private void SmokeTestSuite(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) private void SmokeTestSuite(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl)
{ {
using (_logger.BeginScope("SmokeTestSuite")) using (_logger.BeginScope("SmokeTestSuite"))
{ {
_logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", _logger.WriteInformation("Variation Details : HostType = {0}, DonetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}",
serverType, kreFlavor, architecture, applicationBaseUrl); serverType, donetFlavor, architecture, applicationBaseUrl);
_startParameters = new StartParameters _startParameters = new StartParameters
{ {
ServerType = serverType, ServerType = serverType,
KreFlavor = kreFlavor, DotnetFlavor = donetFlavor,
KreArchitecture = architecture, DotnetArchitecture = architecture,
EnvironmentName = "SocialTesting" EnvironmentName = "SocialTesting"
}; };