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

Don't use hardcoded ports in PreferHostingUrls tests (#1701).

This commit is contained in:
Cesar Blum Silveira 2017-04-17 20:47:46 -07:00 committed by GitHub
parent 801a7c7652
commit a0743650ef
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,15 +229,18 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
} }
[ConditionalFact]
[PortSupportedCondition(5002)] [Fact]
public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeeds() public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeeds()
{ {
var overrideAddress = "http://localhost:5002"; var overrideAddressPort = GetNextPort();
var listenOptionsPort = GetNextPort();
var overrideAddress = $"http://localhost:{overrideAddressPort}";
var testLogger = new TestApplicationErrorLogger(); var testLogger = new TestApplicationErrorLogger();
var hostBuilder = new WebHostBuilder() var hostBuilder = new WebHostBuilder()
.UseKestrel(options => options.Listen(IPAddress.Loopback, 5001)) .UseKestrel(options => options.Listen(IPAddress.Loopback, listenOptionsPort))
.UseUrls(overrideAddress) .UseUrls(overrideAddress)
.PreferHostingUrls(true) .PreferHostingUrls(true)
.UseLoggerFactory(_ => new KestrelTestLoggerFactory(testLogger)) .UseLoggerFactory(_ => new KestrelTestLoggerFactory(testLogger))
@ -247,7 +250,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
host.Start(); host.Start();
Assert.Equal(5002, host.GetPort()); Assert.Equal(overrideAddressPort, host.GetPort());
Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Information && Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Information &&
string.Equals($"Overriding endpoints defined in UseKestrel() since {nameof(IServerAddressesFeature.PreferHostingUrls)} is set to true. Binding to address(es) '{overrideAddress}' instead.", string.Equals($"Overriding endpoints defined in UseKestrel() since {nameof(IServerAddressesFeature.PreferHostingUrls)} is set to true. Binding to address(es) '{overrideAddress}' instead.",
log.Message, StringComparison.Ordinal)); log.Message, StringComparison.Ordinal));
@ -256,15 +259,17 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
} }
} }
[ConditionalFact] [Fact]
[PortSupportedCondition(5001)]
public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfPreferHostingUrlsFalse() public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfPreferHostingUrlsFalse()
{ {
var endPointAddress = "http://localhost:5001"; var endPointPort = GetNextPort();
var useUrlsPort = GetNextPort();
var endPointAddress = $"http://localhost:{endPointPort}";
var hostBuilder = new WebHostBuilder() var hostBuilder = new WebHostBuilder()
.UseKestrel(options => options.Listen(IPAddress.Loopback, 5001)) .UseKestrel(options => options.Listen(IPAddress.Loopback, endPointPort))
.UseUrls("http://localhost:5002") .UseUrls($"http://localhost:{useUrlsPort}")
.PreferHostingUrls(false) .PreferHostingUrls(false)
.Configure(ConfigureEchoAddress); .Configure(ConfigureEchoAddress);
@ -272,19 +277,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
host.Start(); host.Start();
Assert.Equal(5001, host.GetPort()); Assert.Equal(endPointPort, host.GetPort());
Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress)); Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress));
} }
} }
[ConditionalFact] [Fact]
[PortSupportedCondition(5001)]
public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfAddressesEmpty() public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfAddressesEmpty()
{ {
var endPointAddress = "http://localhost:5001"; var endPointPort = GetNextPort();
var endPointAddress = $"http://localhost:{endPointPort}";
var hostBuilder = new WebHostBuilder() var hostBuilder = new WebHostBuilder()
.UseKestrel(options => options.Listen(IPAddress.Loopback, 5001)) .UseKestrel(options => options.Listen(IPAddress.Loopback, endPointPort))
.PreferHostingUrls(true) .PreferHostingUrls(true)
.Configure(ConfigureEchoAddress); .Configure(ConfigureEchoAddress);
@ -292,7 +297,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
host.Start(); host.Start();
Assert.Equal(5001, host.GetPort()); Assert.Equal(endPointPort, host.GetPort());
Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress)); Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress));
} }
} }