Fix tests

Author: javiercn

src/Servers/Kestrel/Core/src/Middleware/HttpsConnectionMiddleware.cs

@@ -220,10 +220,7 @@ public async Task OnConnectionAsync(ConnectionContext context)
                 }
                 catch (AuthenticationException ex)
                 {
-                    if (_serverCertificate == null)
-                    {
-                        _logger.LogDebug(1, ex, CoreStrings.AuthenticationFailed);
-                    }
+                    _logger.LogDebug(1, ex, CoreStrings.AuthenticationFailed);
 
                     await sslStream.DisposeAsync();
                     return;

src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
@@ -14,6 +15,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Tests
@@ -22,15 +25,41 @@ public class KestrelConfigurationBuilderTests
     {
         private KestrelServerOptions CreateServerOptions()
         {
+            var testSink = new TestSink();
             var serverOptions = new KestrelServerOptions();
             var env = new MockHostingEnvironment { ApplicationName = "TestApplication" };
             serverOptions.ApplicationServices = new ServiceCollection()
-                .AddLogging()
+                .AddLogging(l => l.AddProvider(new TestLoggerProvider(testSink)))
                 .AddSingleton<IHostEnvironment>(env)
+                .AddSingleton(testSink)
                 .BuildServiceProvider();
             return serverOptions;
         }
 
+        [Fact]
+        [SkipOnHelix("(none)", Queues = "Ubuntu.1604.Amd64.Open;Windows.10.Amd64.Open")]
+        [OSSkipCondition(OperatingSystems.Linux, SkipReason = "This check only applies to Mac OS as it is the one that checks the key for validity.")]
+        [OSSkipCondition(OperatingSystems.Windows, SkipReason = "This check only applies to Mac OS as it is the one that checks the key for validity.")]
+        public void DevCertWithInvalidPrivateKeyProducesCustomWarning()
+        {
+            var serverOptions = CreateServerOptions();
+            var sink = serverOptions.ApplicationServices.GetRequiredService<TestSink>();
+            var messages = new List<WriteContext>();
+            sink.MessageLogged += wc => messages.Add(wc);
+            serverOptions.Configure()
+                .LocalhostEndpoint(5001, endpointOptions => { });
+
+            Assert.Empty(serverOptions.ListenOptions);
+
+            serverOptions.ConfigurationLoader.Load();
+
+            Assert.Single(serverOptions.ListenOptions);
+            Assert.Equal(5001, serverOptions.ListenOptions[0].IPEndPoint.Port);
+
+            Assert.Equal(5, messages[^1].EventId);
+            Assert.Equal(LogLevel.Warning, messages[^1].LogLevel);
+        }
+
         [Fact]
         public void ConfigureNamedEndpoint_OnlyRunForMatchingConfig()
         {

src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs

@@ -385,38 +385,6 @@ await Assert.ThrowsAnyAsync<Exception>(() =>
             Assert.Equal(LogLevel.Debug, loggerProvider.FilterLogger.LastLogLevel);
         }
 
-        [Fact]
-        [SkipOnHelix("", Queues = "Ubuntu.1604.Amd64.Open;Windows.10.Amd64.Open")]
-        [OSSkipCondition(OperatingSystems.Linux, SkipReason = "This check only applies to Mac OS as it is the one that checks the key for validity.")]
-        [OSSkipCondition(OperatingSystems.Windows, SkipReason = "This check only applies to Mac OS as it is the one that checks the key for validity.")]
-        public async Task DevCertWithInvalidPrivateKeyProducesCustomWarning()
-        {
-            var loggerProvider = new HandshakeErrorLoggerProvider();
-            LoggerFactory.AddProvider(loggerProvider);
-
-            await using (var server = new TestServer(context => Task.CompletedTask,
-                new TestServiceContext(LoggerFactory),
-                listenOptions =>
-                {
-                    listenOptions.UseHttps(TestResources.GetTestCertificate("aspnetdevcert.pfx", "testPassword"));
-                }))
-            {
-                using (var connection = server.CreateConnection())
-                using (var sslStream = new SslStream(connection.Stream, true, (sender, certificate, chain, errors) => true))
-                {
-                    // SslProtocols.Tls is TLS 1.0 which isn't supported by Kestrel by default.
-                    await Assert.ThrowsAnyAsync<Exception>(() =>
-                        sslStream.AuthenticateAsClientAsync("127.0.0.1", clientCertificates: null,
-                            enabledSslProtocols: SslProtocols.Tls,
-                            checkCertificateRevocation: false));
-                }
-            }
-
-            await loggerProvider.FilterLogger.LogTcs.Task.DefaultTimeout();
-            Assert.Equal(3, loggerProvider.FilterLogger.LastEventId);
-            Assert.Equal(LogLevel.Error, loggerProvider.FilterLogger.LastLogLevel);
-        }
-
         [Fact]
         public async Task OnAuthenticate_SeesOtherSettings()
         {