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

[2.1] [Kestrel] Move AddressRegistrationTests to own TestGroup

This commit is contained in:
Stephen Halter 2018-11-26 18:26:00 -08:00
parent 7ee9dac67f
commit dabf5d8ba9
14 changed files with 123 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Servers/Kestrel.sln
View File

@ -49,6 +49,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libuv.BindTests", "Kestrel\test\Libuv.BindTests\Libuv.BindTests.csproj", "{B211AEE8-F28F-45A4-9C71-81691D7C99E1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.BindTests", "Kestrel\test\Sockets.BindTests\Sockets.BindTests.csproj", "{94135813-EBCC-4E4E-8B12-8E5BD58E1350}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -299,6 +303,30 @@ Global
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x64.Build.0 = Release|Any CPU
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x86.ActiveCfg = Release|Any CPU
{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60}.Release|x86.Build.0 = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x64.ActiveCfg = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x64.Build.0 = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x86.ActiveCfg = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Debug|x86.Build.0 = Debug|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|Any CPU.Build.0 = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x64.ActiveCfg = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x64.Build.0 = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x86.ActiveCfg = Release|Any CPU
{B211AEE8-F28F-45A4-9C71-81691D7C99E1}.Release|x86.Build.0 = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x64.ActiveCfg = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x64.Build.0 = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x86.ActiveCfg = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Debug|x86.Build.0 = Debug|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|Any CPU.Build.0 = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x64.ActiveCfg = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x64.Build.0 = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.ActiveCfg = Release|Any CPU
{94135813-EBCC-4E4E-8B12-8E5BD58E1350}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs
View File

@ -11,3 +11,5 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Http2SampleApp, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("PlatformBenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Sockets.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

0
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/HostNameIsReachableAttribute.cs → src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs
View File

0
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IPv6ScopeIdPresentConditionAttribute.cs → src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs
View File

0
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IPv6SupportedConditionAttribute.cs → src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs
View File

0
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/IWebHostPortExtensions.cs → src/Servers/Kestrel/shared/test/TransportTestHelpers/IWebHostPortExtensions.cs
View File

0
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/TestApplicationErrorLoggerLoggedTest.cs → src/Servers/Kestrel/shared/test/TransportTestHelpers/TestApplicationErrorLoggerLoggedTest.cs
View File

0
src/Servers/Kestrel/test/FunctionalTests/AddressRegistrationTests.cs → src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
View File

6
src/Servers/Kestrel/test/BindTests/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.Extensions.Logging.Testing;
[assembly: ShortClassName]

2
src/Servers/Kestrel/test/FunctionalTests/TestHelpers/TestServer.cs
View File

@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
_host.Start();
}
public static void RemoveDevCert(IServiceCollection services)
private static void RemoveDevCert(IServiceCollection services)
{
// KestrelServerOptionsSetup would scan all system certificates on every test server creation
// making test runs very slow

23
src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj Normal file
View File

@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TestGroupName>Libuv.BindTests</TestGroupName>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Libuv.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\**\*.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
</ItemGroup>
</Project>

20
src/Servers/Kestrel/test/Libuv.FunctionalTests/TransportSelector.cs
View File

@ -1,7 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{
@ -9,7 +12,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{
public static IWebHostBuilder GetWebHostBuilder()
{
return new WebHostBuilder().UseLibuv().ConfigureServices(TestServer.RemoveDevCert);
return new WebHostBuilder().UseLibuv().ConfigureServices(RemoveDevCert);
}
private static void RemoveDevCert(IServiceCollection services)
{
// KestrelServerOptionsSetup would scan all system certificates on every test server creation
// making test runs very slow
foreach (var descriptor in services.ToArray())
{
if (descriptor.ImplementationType == typeof(KestrelServerOptionsSetup))
{
services.Remove(descriptor);
}
}
}
}
}

27
src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj Normal file
View File

@ -0,0 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TestGroupName>Sockets.BindTests</TestGroupName>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Sockets.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\**\*.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
<ProjectReference Include="..\..\tools\CodeGenerator\CodeGenerator.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
</ItemGroup>
</Project>

20
src/Servers/Kestrel/test/Sockets.FunctionalTests/TransportSelector.cs
View File

@ -1,7 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{
@ -9,7 +12,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{
public static IWebHostBuilder GetWebHostBuilder()
{
return new WebHostBuilder().UseSockets().ConfigureServices(TestServer.RemoveDevCert);
return new WebHostBuilder().UseSockets().ConfigureServices(RemoveDevCert);
}
private static void RemoveDevCert(IServiceCollection services)
{
// KestrelServerOptionsSetup would scan all system certificates on every test server creation
// making test runs very slow
foreach (var descriptor in services.ToArray())
{
if (descriptor.ImplementationType == typeof(KestrelServerOptionsSetup))
{
services.Remove(descriptor);
}
}
}
}
}