From ececa0b3f0599d4cda31f7ff0750fc7d2fed6c80 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev <55398552+alnikola@users.noreply.github.com> Date: Mon, 2 Aug 2021 15:09:09 +0200 Subject: [PATCH 1/4] Enable Http2.SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled The test should have been already fixed by #56552 --- .../tests/FunctionalTests/HttpClientHandlerTest.Http2.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs index c9c5db60d0f00..a66c33bfde89f 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs @@ -3581,7 +3581,6 @@ await Http2LoopbackServer.CreateClientAndServerAsync( [Fact] [OuterLoop("Uses Task.Delay")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/44352", TestPlatforms.OSX)] public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled() { TaskCompletionSource clientComplete = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); From c3a5e67ae989182d5d23bff8eea47972c3767a30 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev <55398552+alnikola@users.noreply.github.com> Date: Tue, 3 Aug 2021 11:25:59 +0200 Subject: [PATCH 2/4] Run test in a loop --- .../FunctionalTests/HttpClientHandlerTest.Http2.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs index a66c33bfde89f..9f306fe1836b5 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs @@ -3578,11 +3578,18 @@ await Http2LoopbackServer.CreateClientAndServerAsync( } }); } + + public static IEnumerable LongRunning() + { + return Enumerable.Repeat(true, 100).Select((b, i) => new object[] { i % 2 == 0 }).ToArray(); + } - [Fact] + [ConditionalTheory(nameof(SupportsAlpn))] + [MemberData(nameof(LongRunning))] [OuterLoop("Uses Task.Delay")] - public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled() + public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled(bool b) { + Assert.Equal(b, b); TaskCompletionSource clientComplete = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); await Http2LoopbackServer.CreateClientAndServerAsync( From 57f598cdcb9b43c0465f703d07a7a7e5f5011b83 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev <55398552+alnikola@users.noreply.github.com> Date: Tue, 3 Aug 2021 19:56:18 +0200 Subject: [PATCH 3/4] Remove test code --- .../FunctionalTests/HttpClientHandlerTest.Http2.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs index 9f306fe1836b5..f0db5473dc2a2 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs @@ -3579,17 +3579,10 @@ await Http2LoopbackServer.CreateClientAndServerAsync( }); } - public static IEnumerable LongRunning() - { - return Enumerable.Repeat(true, 100).Select((b, i) => new object[] { i % 2 == 0 }).ToArray(); - } - - [ConditionalTheory(nameof(SupportsAlpn))] - [MemberData(nameof(LongRunning))] + [Fact] [OuterLoop("Uses Task.Delay")] - public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled(bool b) + public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled() { - Assert.Equal(b, b); TaskCompletionSource clientComplete = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); await Http2LoopbackServer.CreateClientAndServerAsync( From 7dff6a135baabdceeb7102406275dbaabedbb4c2 Mon Sep 17 00:00:00 2001 From: Alexander Nikolaev <55398552+alnikola@users.noreply.github.com> Date: Tue, 3 Aug 2021 19:58:47 +0200 Subject: [PATCH 4/4] Remove redundant whitespaces --- .../tests/FunctionalTests/HttpClientHandlerTest.Http2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs index f0db5473dc2a2..a66c33bfde89f 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs @@ -3578,7 +3578,7 @@ await Http2LoopbackServer.CreateClientAndServerAsync( } }); } - + [Fact] [OuterLoop("Uses Task.Delay")] public async Task SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled()