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

Reacting to Hosting changes

This commit is contained in:
Pranav K 2015-09-28 21:59:59 -07:00
parent 019a50b3db
commit 9070e12766
3 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/E2ETests/Common/Helpers.cs
View File

@ -23,8 +23,7 @@ namespace E2ETests
public static void SetInMemoryStoreForIIS(DeploymentParameters deploymentParameters, ILogger logger) public static void SetInMemoryStoreForIIS(DeploymentParameters deploymentParameters, ILogger logger)
{ {
if (deploymentParameters.ServerType == ServerType.IIS if (deploymentParameters.ServerType == ServerType.IIS)
|| deploymentParameters.ServerType == ServerType.IISNativeModule)
{ {
// Can't use localdb with IIS. Setting an override to use InMemoryStore. // Can't use localdb with IIS. Setting an override to use InMemoryStore.
logger.LogInformation("Creating configoverride.json file to override default config."); logger.LogInformation("Creating configoverride.json file to override default config.");

4
test/E2ETests/Implementation/Validator.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Server.Testing; using Microsoft.AspNet.Server.Testing;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
@ -126,8 +125,7 @@ namespace E2ETests
private string PrefixBaseAddress(string url) private string PrefixBaseAddress(string url)
{ {
#if DNX451 #if DNX451
url = (_deploymentResult.DeploymentParameters.ServerType == ServerType.IISNativeModule || url = _deploymentResult.DeploymentParameters.ServerType == ServerType.IIS ?
_deploymentResult.DeploymentParameters.ServerType == ServerType.IIS) ?
string.Format(url, new Uri(_deploymentResult.ApplicationBaseUri).Segments[1].TrimEnd('/')) : string.Format(url, new Uri(_deploymentResult.ApplicationBaseUri).Segments[1].TrimEnd('/')) :
string.Format(url, string.Empty); string.Format(url, string.Empty);
#else #else

41
test/E2ETests/SmokeTests.cs
View File

@ -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 public class SmokeTests_OnIIS
{ {
[ConditionalTheory, Trait("E2Etests", "E2Etests")] [ConditionalTheory, Trait("E2Etests", "E2Etests")]
@ -166,8 +128,7 @@ namespace E2ETests
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {
if (!Helpers.RunningOnMono if (!Helpers.RunningOnMono
&& parameters.ServerType != ServerType.IIS && parameters.ServerType != ServerType.IIS)
&& parameters.ServerType != ServerType.IISNativeModule)
{ {
// Mono uses InMemoryStore // Mono uses InMemoryStore
DbUtils.DropDatabase(musicStoreDbName, logger); DbUtils.DropDatabase(musicStoreDbName, logger);