fix tests

Author: BrennanConroy

src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/HostingTests.cs

@@ -25,18 +25,16 @@ public async Task WebhostLoadsKeyRingBeforeServerStarts()
             .Returns(Mock.Of<IKeyRing>())
             .Callback(() => tcs.TrySetResult());
 
-        var builder = new HostBuilder()
-            .ConfigureWebHost(webHostBuilder =>
-            {
-                webHostBuilder
-                    .UseStartup<TestStartup>();
-            })
+#pragma warning disable CS0618 // Type or member is obsolete
+        var builder = new WebHostBuilder()
+            .UseStartup<TestStartup>()
             .ConfigureServices(s =>
                 s.AddDataProtection()
                 .Services
                 .Replace(ServiceDescriptor.Singleton(mockKeyRing.Object))
                 .AddSingleton<IServer>(
                     new FakeServer(onStart: () => tcs.TrySetException(new InvalidOperationException("Server was started before key ring was initialized")))));
+#pragma warning restore CS0618 // Type or member is obsolete
 
         using (var host = builder.Build())
         {

src/Servers/Kestrel/Kestrel/test/HttpsConfigurationTests.cs

@@ -42,19 +42,21 @@ public async Task BindAddressFromSetting(string address, bool useKestrelHttpsCon
                 }
             });
 
-        var host = hostBuilder.Build();
-        await host.StartAsync();
-
-        Assert.Single(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses, address);
+        using var host = hostBuilder.Build();
 
         if (address.StartsWith("https", StringComparison.OrdinalIgnoreCase) && !useKestrelHttpsConfiguration)
         {
-            Assert.Throws<InvalidOperationException>(host.Run);
+            Assert.Throws<InvalidOperationException>(host.Start);
+            Assert.Empty(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses);
         }
         else
         {
-            // Binding succeeds - server is already started, so we just stop it
-            await host.StopAsync();
+            //// Binding succeeds - server is already started, so we just stop it
+            await host.StartAsync();
+
+            var addr = Assert.Single(host.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses);
+            // addr will contain the realized port, so we'll remove the port for comparison
+            Assert.Equal(address[..^2].ToString(), addr.Substring(0, addr.LastIndexOf(':')));
         }
     }