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

Revert "Skip IIS Express on Windows 7 (#8330)" (#9490) 

This reverts commit b2a58ab8de.
This commit is contained in:
Justin Kotalik 2019-04-18 08:57:50 -07:00 committed by GitHub
parent f95960d856
commit 8b536b08ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs
View File

@ -289,15 +289,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
} }
} }
// https://github.com/aspnet/AspNetCore/issues/8329
if (hostingModel == HostingModel.OutOfProcess &&
server == ServerType.IISExpress &&
Environment.OSVersion.Version.Major == 6 &&
Environment.OSVersion.Version.Minor == 1)
{
continue;
}
variants.Add(new TestVariant() variants.Add(new TestVariant()
{ {
Server = server, Server = server,

6
src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" } from s in new string[] { (_minPort - 1).ToString(), (_maxPort + 1).ToString(), "noninteger" }
select new object[] { v, s }; select new object[] { v, s };
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")] [ConditionalTheory]
[MemberData(nameof(TestVariants))] [MemberData(nameof(TestVariants))]
public async Task EnvVarInWebConfig_Valid(TestVariant variant) public async Task EnvVarInWebConfig_Valid(TestVariant variant)
{ {
@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
Assert.Equal(port, new Uri(responseText).Port); Assert.Equal(port, new Uri(responseText).Port);
} }
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")] [ConditionalTheory]
[MemberData(nameof(TestVariants))] [MemberData(nameof(TestVariants))]
public async Task EnvVarInWebConfig_Empty(TestVariant variant) public async Task EnvVarInWebConfig_Empty(TestVariant variant)
{ {
@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort); Assert.InRange(new Uri(responseText).Port, _minPort, _maxPort);
} }
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")] [ConditionalTheory]
[MemberData(nameof(InvalidTestVariants))] [MemberData(nameof(InvalidTestVariants))]
public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port) public async Task EnvVarInWebConfig_Invalid(TestVariant variant, string port)
{ {

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
.WithTfms(Tfm.NetCoreApp30) .WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes(); .WithAllApplicationTypes();
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")] [ConditionalTheory]
[MemberData(nameof(TestVariants))] [MemberData(nameof(TestVariants))]
public async Task HelloWorld(TestVariant variant) public async Task HelloWorld(TestVariant variant)
{ {

2
src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
=> TestMatrix.ForServers(DeployerSelector.ServerType) => TestMatrix.ForServers(DeployerSelector.ServerType)
.WithTfms(Tfm.NetCoreApp30); .WithTfms(Tfm.NetCoreApp30);
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/8329")] [ConditionalTheory]
[RequiresIIS(IISCapability.WindowsAuthentication)] [RequiresIIS(IISCapability.WindowsAuthentication)]
[MemberData(nameof(TestVariants))] [MemberData(nameof(TestVariants))]
public async Task NtlmAuthentication(TestVariant variant) public async Task NtlmAuthentication(TestVariant variant)

17
src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
View File

@ -10,22 +10,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)] [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
public sealed class RequiresIISAttribute : Attribute, ITestCondition public sealed class RequiresIISAttribute : Attribute, ITestCondition
{ {
public bool IsMet { get ; } = IISExpressAncmSchema.SupportsInProcessHosting; public bool IsMet => IISExpressAncmSchema.SupportsInProcessHosting;
public string SkipReason { get; } = IISExpressAncmSchema.SkipReason; public string SkipReason => IISExpressAncmSchema.SkipReason;
public RequiresIISAttribute() public RequiresIISAttribute() { }
{
// https://github.com/aspnet/AspNetCore/issues/8329
if (Environment.OSVersion.Version.Major == 6 &&
Environment.OSVersion.Version.Minor == 1)
{
IsMet = false;
SkipReason = "Skipped on Windows 7";
}
}
public RequiresIISAttribute(IISCapability capabilities) : this() public RequiresIISAttribute(IISCapability capabilities)
{ {
// IISCapabilities aren't pertinent to IISExpress // IISCapabilities aren't pertinent to IISExpress
} }