Răsfoiți Sursa

Quarantine httpsys test (#29127)

Justin Kotalik 5 ani în urmă
părinte
comite
30943dee0d

+ 4 - 3
src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs

@@ -20,7 +20,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
 {
-    public class Http2Tests
+    public class Http2Tests : LoggedTest
     {
         private const string VersionForReset = "10.0.19529";
 
@@ -575,7 +575,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
                 var feature = httpContext.Features.Get<IHttpResetFeature>();
                 Assert.Null(feature);
                 return httpContext.Response.WriteAsync("Hello World");
-            });
+            }, LoggerFactory);
 
             var handler = new HttpClientHandler();
             handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
@@ -607,6 +607,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
         }
 
         [ConditionalFact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/29126")]
         [MinimumOSVersion(OperatingSystems.Windows, VersionForReset)]
         public async Task Reset_BeforeResponse_Resets()
         {
@@ -626,7 +627,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
                     appResult.SetException(ex);
                 }
                 return Task.FromResult(0);
-            });
+            }, LoggerFactory);
 
             await new HostBuilder()
                 .UseHttp2Cat(address, async h2Connection =>

+ 8 - 8
src/Servers/HttpSys/test/FunctionalTests/Utilities.cs

@@ -110,14 +110,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys
             return host;
         }
 
-        internal static MessagePump CreatePump()
-            => new MessagePump(Options.Create(new HttpSysOptions()), new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+        internal static MessagePump CreatePump(ILoggerFactory loggerFactory = null)
+            => new MessagePump(Options.Create(new HttpSysOptions()), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
 
-        internal static MessagePump CreatePump(Action<HttpSysOptions> configureOptions)
+        internal static MessagePump CreatePump(Action<HttpSysOptions> configureOptions, ILoggerFactory loggerFactory = null)
         {
             var options = new HttpSysOptions();
             configureOptions(options);
-            return new MessagePump(Options.Create(options), new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
+            return new MessagePump(Options.Create(options), loggerFactory ?? new LoggerFactory(), new AuthenticationSchemeProvider(Options.Create(new AuthenticationOptions())));
         }
 
         internal static IServer CreateDynamicHttpServer(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app)
@@ -135,12 +135,12 @@ namespace Microsoft.AspNetCore.Server.HttpSys
             return server;
         }
 
-        internal static IServer CreateDynamicHttpsServer(out string baseAddress, RequestDelegate app)
+        internal static IServer CreateDynamicHttpsServer(out string baseAddress, RequestDelegate app, ILoggerFactory loggerFactory = null)
         {
-            return CreateDynamicHttpsServer("/", out var root, out baseAddress, options => { }, app);
+            return CreateDynamicHttpsServer("/", out var root, out baseAddress, options => { }, app, loggerFactory);
         }
 
-        internal static IServer CreateDynamicHttpsServer(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app)
+        internal static IServer CreateDynamicHttpsServer(string basePath, out string root, out string baseAddress, Action<HttpSysOptions> configureOptions, RequestDelegate app, ILoggerFactory loggerFactory = null)
         {
             lock (PortLock)
             {
@@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                     root = prefix.Scheme + "://" + prefix.Host + ":" + prefix.Port;
                     baseAddress = prefix.ToString();
 
-                    var server = CreatePump();
+                    var server = CreatePump(loggerFactory);
                     server.Features.Get<IServerAddressesFeature>().Addresses.Add(baseAddress);
                     configureOptions(server.Listener.Options);
                     try