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

Merge branch 'release/2.2'

This commit is contained in:
John Luo 2018-08-20 19:58:09 -07:00
parent 066e89ddf9 74f4387807
commit fab944f8ad
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/Kestrel.Transport.BindTests/AddressRegistrationTests.cs
View File

@ -46,18 +46,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
await RegisterAddresses_Success(addressInput, testUrl); await RegisterAddresses_Success(addressInput, testUrl);
} }
[ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv4Port5000Default))]
public async Task RegisterAddresses_IPv4Port5000Default_Success(string addressInput, string testUrl)
{
if (!CanBindToEndpoint(IPAddress.Loopback, 5000))
{
return;
}
await RegisterAddresses_Success(addressInput, testUrl, 5000);
}
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv4Port80))] [MemberData(nameof(AddressRegistrationDataIPv4Port80))]
public async Task RegisterAddresses_IPv4Port80_Success(string addressInput, string testUrl) public async Task RegisterAddresses_IPv4Port80_Success(string addressInput, string testUrl)
@ -124,19 +112,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
await RegisterAddresses_Success(addressInput, testUrls); await RegisterAddresses_Success(addressInput, testUrls);
} }
[ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv6Port5000Default))]
[IPv6SupportedCondition]
public async Task RegisterAddresses_IPv6Port5000Default_Success(string addressInput, string[] testUrls)
{
if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000))
{
return;
}
await RegisterAddresses_Success(addressInput, testUrls);
}
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv6Port80))] [MemberData(nameof(AddressRegistrationDataIPv6Port80))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
@ -870,13 +845,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
public static TheoryData<string, string> AddressRegistrationDataIPv4Port5000Default =>
new TheoryData<string, string>
{
{ null, "http://127.0.0.1:5000/" },
{ string.Empty, "http://127.0.0.1:5000/" }
};
public static TheoryData<IPEndPoint, string> IPEndPointRegistrationDataDynamicPort public static TheoryData<IPEndPoint, string> IPEndPointRegistrationDataDynamicPort
{ {
get get
@ -974,13 +942,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
public static TheoryData<string, string[]> AddressRegistrationDataIPv6Port5000Default =>
new TheoryData<string, string[]>
{
{ null, new[] { "http://127.0.0.1:5000/", "http://[::1]:5000/" } },
{ string.Empty, new[] { "http://127.0.0.1:5000/", "http://[::1]:5000/" } }
};
public static TheoryData<string, string[]> AddressRegistrationDataIPv6Port80 => public static TheoryData<string, string[]> AddressRegistrationDataIPv6Port80 =>
new TheoryData<string, string[]> new TheoryData<string, string[]>
{ {