Mark flaky AddressRegistrationTests with the FlakyAttribute (#11696)

This commit is contained in:
Stephen Halter 2019-06-28 17:53:08 -07:00 committed by GitHub
parent 7c809f6c22
commit bc71b2fdaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions

View File

@ -8,7 +8,6 @@ using System.Linq;
using System.Net; using System.Net;
using System.Net.NetworkInformation; using System.Net.NetworkInformation;
using System.Net.Sockets; using System.Net.Sockets;
using System.Security.Cryptography.X509Certificates;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
@ -48,8 +47,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
await RegisterAddresses_Success(addressInput, testUrl); await RegisterAddresses_Success(addressInput, testUrl);
} }
[ConditionalTheory] [Theory]
[MemberData(nameof(AddressRegistrationDataIPv4Port5000Default))] [MemberData(nameof(AddressRegistrationDataIPv4Port5000Default))]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public async Task RegisterAddresses_IPv4Port5000Default_Success(string addressInput, string testUrl) public async Task RegisterAddresses_IPv4Port5000Default_Success(string addressInput, string testUrl)
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 5000)) if (!CanBindToEndpoint(IPAddress.Loopback, 5000))
@ -60,8 +60,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
await RegisterAddresses_Success(addressInput, testUrl, 5000); await RegisterAddresses_Success(addressInput, testUrl, 5000);
} }
[ConditionalTheory] [Theory]
[MemberData(nameof(AddressRegistrationDataIPv4Port80))] [MemberData(nameof(AddressRegistrationDataIPv4Port80))]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public async Task RegisterAddresses_IPv4Port80_Success(string addressInput, string testUrl) public async Task RegisterAddresses_IPv4Port80_Success(string addressInput, string testUrl)
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 80)) if (!CanBindToEndpoint(IPAddress.Loopback, 80))
@ -109,6 +110,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(IPEndPointRegistrationDataPort443))] [MemberData(nameof(IPEndPointRegistrationDataPort443))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public async Task RegisterIPEndPoint_Port443_Success(IPEndPoint endpoint, string testUrl) public async Task RegisterIPEndPoint_Port443_Success(IPEndPoint endpoint, string testUrl)
{ {
if (!CanBindToEndpoint(endpoint.Address, 443)) if (!CanBindToEndpoint(endpoint.Address, 443))
@ -130,6 +132,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv6Port5000Default))] [MemberData(nameof(AddressRegistrationDataIPv6Port5000Default))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public async Task RegisterAddresses_IPv6Port5000Default_Success(string addressInput, string[] testUrls) public async Task RegisterAddresses_IPv6Port5000Default_Success(string addressInput, string[] testUrls)
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000)) if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000))
@ -143,6 +146,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[MemberData(nameof(AddressRegistrationDataIPv6Port80))] [MemberData(nameof(AddressRegistrationDataIPv6Port80))]
[IPv6SupportedCondition] [IPv6SupportedCondition]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public async Task RegisterAddresses_IPv6Port80_Success(string addressInput, string[] testUrls) public async Task RegisterAddresses_IPv6Port80_Success(string addressInput, string[] testUrls)
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 80) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 80)) if (!CanBindToEndpoint(IPAddress.Loopback, 80) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 80))
@ -320,7 +324,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
private Task RegisterIPEndPoint_StaticPort_Success(IPAddress address, string testUrl) private Task RegisterIPEndPoint_StaticPort_Success(IPAddress address, string testUrl)
=> RunTestWithStaticPort(port => RegisterIPEndPoint_Success(new IPEndPoint(address, port), testUrl, port)); => RunTestWithStaticPort(port => RegisterIPEndPoint_Success(new IPEndPoint(address, port), testUrl, port));
[ConditionalFact] [Fact]
public async Task ListenAnyIP_IPv4_Success() public async Task ListenAnyIP_IPv4_Success()
{ {
await ListenAnyIP_Success(new[] { "http://localhost", "http://127.0.0.1" }); await ListenAnyIP_Success(new[] { "http://localhost", "http://127.0.0.1" });
@ -369,7 +373,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
[ConditionalFact] [Fact]
public async Task ListenLocalhost_IPv4LocalhostStaticPort_Success() public async Task ListenLocalhost_IPv4LocalhostStaticPort_Success()
{ {
await ListenLocalhost_StaticPort_Success(new[] { "http://localhost", "http://127.0.0.1" }); await ListenLocalhost_StaticPort_Success(new[] { "http://localhost", "http://127.0.0.1" });
@ -413,6 +417,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
[Fact] [Fact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public Task DefaultsServerAddress_BindsToIPv4() public Task DefaultsServerAddress_BindsToIPv4()
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 5000)) if (!CanBindToEndpoint(IPAddress.Loopback, 5000))
@ -425,6 +430,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalFact] [ConditionalFact]
[IPv6SupportedCondition] [IPv6SupportedCondition]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public Task DefaultsServerAddress_BindsToIPv6() public Task DefaultsServerAddress_BindsToIPv6()
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000)) if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000))
@ -435,7 +441,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
return RegisterDefaultServerAddresses_Success(new[] { "http://127.0.0.1:5000", "http://[::1]:5000" }); return RegisterDefaultServerAddresses_Success(new[] { "http://127.0.0.1:5000", "http://[::1]:5000" });
} }
[ConditionalFact] [Fact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.macOS)]
public Task DefaultsServerAddress_BindsToIPv4WithHttps() public Task DefaultsServerAddress_BindsToIPv4WithHttps()
{ {
if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.Loopback, 5001)) if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.Loopback, 5001))