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

Fix flaky tests that bind to discovered IP addresses (#1795)

This commit is contained in:
Stephen Halter 2017-05-01 11:41:10 -07:00
parent 9185deecda
commit 0afb874555
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs
View File

@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Xunit; using Xunit;
@ -559,7 +558,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// Non-loopback addresses // Non-loopback addresses
var ipv4Addresses = GetIPAddresses() var ipv4Addresses = GetIPAddresses()
.Where(ip => ip.AddressFamily == AddressFamily.InterNetwork); .Where(ip => ip.AddressFamily == AddressFamily.InterNetwork)
.Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0)));
foreach (var ip in ipv4Addresses) foreach (var ip in ipv4Addresses)
{ {
dataset.Add($"http://{ip}:0/", $"http://{ip}"); dataset.Add($"http://{ip}:0/", $"http://{ip}");
@ -602,7 +603,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// Non-loopback addresses // Non-loopback addresses
var ipv4Addresses = GetIPAddresses() var ipv4Addresses = GetIPAddresses()
.Where(ip => ip.AddressFamily == AddressFamily.InterNetwork); .Where(ip => ip.AddressFamily == AddressFamily.InterNetwork)
.Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0)));
foreach (var ip in ipv4Addresses) foreach (var ip in ipv4Addresses)
{ {
dataset.Add(new IPEndPoint(ip, 0), $"http://{ip}"); dataset.Add(new IPEndPoint(ip, 0), $"http://{ip}");
@ -611,7 +614,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
var ipv6Addresses = GetIPAddresses() var ipv6Addresses = GetIPAddresses()
.Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6) .Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6)
.Where(ip => ip.ScopeId == 0); .Where(ip => ip.ScopeId == 0)
.Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0)));
foreach (var ip in ipv6Addresses) foreach (var ip in ipv6Addresses)
{ {
dataset.Add(new IPEndPoint(ip, 0), $"http://[{ip}]"); dataset.Add(new IPEndPoint(ip, 0), $"http://[{ip}]");
@ -656,7 +661,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
// Non-loopback addresses // Non-loopback addresses
var ipv6Addresses = GetIPAddresses() var ipv6Addresses = GetIPAddresses()
.Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6) .Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6)
.Where(ip => ip.ScopeId == 0); .Where(ip => ip.ScopeId == 0)
.Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0)));
foreach (var ip in ipv6Addresses) foreach (var ip in ipv6Addresses)
{ {
dataset.Add($"http://[{ip}]:0/", new[] { $"http://[{ip}]" }); dataset.Add($"http://[{ip}]:0/", new[] { $"http://[{ip}]" });
@ -692,6 +699,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
.Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6) .Where(ip => ip.AddressFamily == AddressFamily.InterNetworkV6)
.Where(ip => ip.ScopeId != 0) .Where(ip => ip.ScopeId != 0)
.Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0))); .Where(ip => CanBindAndConnectToEndpoint(new IPEndPoint(ip, 0)));
foreach (var ip in ipv6Addresses) foreach (var ip in ipv6Addresses)
{ {
dataset.Add($"http://[{ip}]:0/", $"http://[{ip}]"); dataset.Add($"http://[{ip}]:0/", $"http://[{ip}]");