From c1607cbb9bfe70da2861aa9a1a905e31d7ac678e Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 4 Mar 2021 14:02:08 -0800 Subject: [PATCH 1/2] Skip conflicting test and re-enable WebHostBuilder test --- src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs | 2 +- src/Hosting/Hosting/test/WebHostBuilderTests.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs index 6fc75016976d..d255265e1e96 100644 --- a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs +++ b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs @@ -493,7 +493,7 @@ public void ActivityOnImportHookIsCalled() Assert.True(Activity.Current.Recorded); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/30582")] public void ActivityListenersAreCalled() { var hostingApplication = CreateApplication(out var features); diff --git a/src/Hosting/Hosting/test/WebHostBuilderTests.cs b/src/Hosting/Hosting/test/WebHostBuilderTests.cs index b082b042467b..c64bb5e307a6 100644 --- a/src/Hosting/Hosting/test/WebHostBuilderTests.cs +++ b/src/Hosting/Hosting/test/WebHostBuilderTests.cs @@ -21,7 +21,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Logging.Testing; using Xunit; [assembly: HostingStartup(typeof(WebHostBuilderTests.TestHostingStartup))] @@ -115,7 +114,6 @@ public async Task MultipleUseStartupCallsLastWins(IWebHostBuilder builder) [Theory] [MemberData(nameof(DefaultWebHostBuildersWithConfig))] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30582")] public async Task UseStartupFactoryWorks(IWebHostBuilder builder) { void ConfigureServices(IServiceCollection services) { } From 3589b56baa383933e007b720767519749652df32 Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 5 Mar 2021 11:19:10 -0800 Subject: [PATCH 2/2] Update WebHostBuilderTests.cs --- src/Hosting/Hosting/test/WebHostBuilderTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Hosting/Hosting/test/WebHostBuilderTests.cs b/src/Hosting/Hosting/test/WebHostBuilderTests.cs index c64bb5e307a6..5666acefeaae 100644 --- a/src/Hosting/Hosting/test/WebHostBuilderTests.cs +++ b/src/Hosting/Hosting/test/WebHostBuilderTests.cs @@ -15,12 +15,12 @@ using Microsoft.AspNetCore.Hosting.Tests.Fakes; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Logging.Testing; using Xunit; [assembly: HostingStartup(typeof(WebHostBuilderTests.TestHostingStartup))]