From 452151bd5640a51b89920e4a092c6bd1d52b6bb2 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Tue, 9 Jul 2024 22:28:34 +0200 Subject: [PATCH 1/5] SocketsHttpHandler_DiagnosticsTest_Http3 --- .../tests/FunctionalTests/SocketsHttpHandlerTest.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index ea34d7bf2479d..c1ada9540cd39 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -292,6 +292,12 @@ public SocketsHttpHandler_DiagnosticsTest_Http2(ITestOutputHelper output) : base protected override Version UseVersion => HttpVersion.Version20; } + public sealed class SocketsHttpHandler_DiagnosticsTest_Http3 : DiagnosticsTest + { + public SocketsHttpHandler_DiagnosticsTest_Http3(ITestOutputHelper output) : base(output) { } + protected override Version UseVersion => HttpVersion.Version30; + } + public sealed class SocketsHttpHandler_HttpClient_SelectedSites_Test : HttpClient_SelectedSites_Test { public SocketsHttpHandler_HttpClient_SelectedSites_Test(ITestOutputHelper output) : base(output) { } From 89015f03b6e030fe73a65c97f8fe429c49f50521 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Tue, 9 Jul 2024 22:32:55 +0200 Subject: [PATCH 2/5] Update src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs --- .../tests/FunctionalTests/SocketsHttpHandlerTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs index c1ada9540cd39..18d3ee156e785 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs @@ -292,6 +292,8 @@ public SocketsHttpHandler_DiagnosticsTest_Http2(ITestOutputHelper output) : base protected override Version UseVersion => HttpVersion.Version20; } + [ConditionalClass(typeof(HttpClientHandlerTestBase), nameof(IsQuicSupported))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/103703", typeof(PlatformDetection), nameof(PlatformDetection.IsArmProcess))] public sealed class SocketsHttpHandler_DiagnosticsTest_Http3 : DiagnosticsTest { public SocketsHttpHandler_DiagnosticsTest_Http3(ITestOutputHelper output) : base(output) { } From 4ca1f98373e14ddd077e879b59a7ffebae47bdce Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Wed, 10 Jul 2024 23:45:47 +0200 Subject: [PATCH 3/5] Skip SendAsync_ExpectedDiagnosticCancelledLogging for HTTP/3 --- .../tests/FunctionalTests/DiagnosticsTests.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index a46d376157fc1..5953c531033af 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -13,6 +13,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.DotNet.RemoteExecutor; +using Microsoft.DotNet.XUnitExtensions; using Xunit; using Xunit.Abstractions; @@ -236,6 +237,12 @@ await RemoteExecutor.Invoke(async (useVersion, testAsync) => [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] public async Task SendAsync_ExpectedDiagnosticCancelledLogging() { + if (UseVersion == HttpVersion30) + { + // [ActiveIssue("https://github.com/dotnet/runtime/issues/104699")] + throw new SkipTestException("SendAsync_ExpectedDiagnosticCancelledLogging is broken on HTTP/3."); + } + await RemoteExecutor.Invoke(async (useVersion, testAsync) => { TaskCompletionSource responseLoggedTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); From 15acc43f45d4961b246a625399ca334d98e529e2 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Wed, 10 Jul 2024 23:48:16 +0200 Subject: [PATCH 4/5] . --- .../System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index 5953c531033af..ec5ce36048733 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -235,7 +235,7 @@ await RemoteExecutor.Invoke(async (useVersion, testAsync) => } [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] - public async Task SendAsync_ExpectedDiagnosticCancelledLogging() + public async Task SendAsync_ExpectedDiagnosticCancelledLogging() { if (UseVersion == HttpVersion30) { From 6270129c1a05da65de44e6c33f7e1bf6b36dc8a6 Mon Sep 17 00:00:00 2001 From: antonfirsov Date: Wed, 10 Jul 2024 23:49:10 +0200 Subject: [PATCH 5/5] . --- .../System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs index ec5ce36048733..5953c531033af 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs @@ -235,7 +235,7 @@ await RemoteExecutor.Invoke(async (useVersion, testAsync) => } [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] - public async Task SendAsync_ExpectedDiagnosticCancelledLogging() + public async Task SendAsync_ExpectedDiagnosticCancelledLogging() { if (UseVersion == HttpVersion30) {