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

Address flaky ANCMV1 tests (#6844)

This commit is contained in:
Justin Kotalik 2019-01-18 14:22:56 -08:00 committed by GitHub
parent ee5d6a2246
commit 707f06ead8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
View File

@ -18,7 +18,7 @@ namespace E2ETests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels()
.WithAllArchitectures();

2
src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
View File

@ -19,7 +19,7 @@ namespace E2ETests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]

19
src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs
View File

@ -32,7 +32,24 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
public HttpClient CreateClient(HttpMessageHandler messageHandler)
{
return new HttpClient(new LoggingHandler(messageHandler, Logger))
if (DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModule)
{
return CreateRetryClient(messageHandler);
}
else
{
return new HttpClient(new LoggingHandler(messageHandler, Logger))
{
BaseAddress = base.HttpClient.BaseAddress
};
}
}
private HttpClient CreateRetryClient(HttpMessageHandler messageHandler)
{
var loggingHandler = new LoggingHandler(messageHandler, Logger);
var retryHandler = new RetryHandler(loggingHandler, Logger);
return new HttpClient(retryHandler)
{
BaseAddress = base.HttpClient.BaseAddress
};

2
src/Servers/test/FunctionalTests/HelloWorldTest.cs
View File

@ -23,7 +23,7 @@ namespace ServerComparison.FunctionalTests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithApplicationTypes(ApplicationType.Portable)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels()
.WithAllArchitectures();

2
src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs
View File

@ -23,7 +23,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]

8
src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
View File

@ -34,7 +34,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix NoCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]
@ -47,7 +47,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix HostCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress /*, ServerType.Nginx https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ )
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]
@ -60,7 +60,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix AppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) // No pass-through compression for nginx
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]
@ -73,7 +73,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix HostAndAppCompressionTestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]

2
src/Servers/test/FunctionalTests/ResponseTests.cs
View File

@ -27,7 +27,7 @@ namespace ServerComparison.FunctionalTests
public static TestMatrix TestVariants
=> TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6168, */ ServerType.Kestrel, /* ServerType.Nginx, https://github.com/aspnet/AspNetCore-Internal/issues/1525 */ ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllAncmVersions()
.WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]