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

Skip/disable tests in 2.2 for IIS (#12985) 

* Skip/disable tests in 2.2 for IIS

* Update ServicesTests.cs
This commit is contained in:
Justin Kotalik 2019-08-13 14:00:33 -07:00 committed by Doug Bunting
parent 735807d6ff
commit 2217be2826
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs
View File

@ -49,6 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
} }
[ConditionalTheory] [ConditionalTheory]
[RequiresNewHandler]
[InlineData("/RequestPath/a/b/../c", "/a/c")] [InlineData("/RequestPath/a/b/../c", "/a/c")]
[InlineData("/RequestPath/a/b/./c", "/a/b/c")] [InlineData("/RequestPath/a/b/./c", "/a/b/c")]
public async Task Request_WithNavigation_Removed(string input, string expectedPath) public async Task Request_WithNavigation_Removed(string input, string expectedPath)
@ -59,6 +60,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
} }
[ConditionalTheory] [ConditionalTheory]
[RequiresNewHandler]
[InlineData("/RequestPath/a/b/%2E%2E/c", "/a/c")] [InlineData("/RequestPath/a/b/%2E%2E/c", "/a/c")]
[InlineData("/RequestPath/a/b/%2E/c", "/a/b/c")] [InlineData("/RequestPath/a/b/%2E/c", "/a/b/c")]
public async Task Request_WithEscapedNavigation_Removed(string input, string expectedPath) public async Task Request_WithEscapedNavigation_Removed(string input, string expectedPath)

2
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs
View File

@ -70,7 +70,7 @@ namespace IIS.FunctionalTests
var result = await DeployAsync(baseDeploymentParameters); var result = await DeployAsync(baseDeploymentParameters);
await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 3000);
StopServer(); StopServer();
EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result));
} }