From 06b43bd28e86c0cf57190b16990ff3dfece32e97 Mon Sep 17 00:00:00 2001 From: Tomas Weinfurt Date: Wed, 29 May 2019 19:33:18 -0700 Subject: [PATCH] Enable MaxConnectionsPerServer_WaitingConnectionsAreCancelable again (dotnet/corefx#37933) * enable MaxConnectionsPerServer_WaitingConnectionsAreCancelable afain * skip with curl handler Commit migrated from https://github.com/dotnet/corefx/commit/c6fc43c6f2b92d8e13a444217f29368159e015eb --- .../FunctionalTests/HttpClientHandlerTest.Cancellation.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs index cd03b96..ad83432 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Cancellation.cs @@ -9,6 +9,9 @@ using System.IO; using System.Net.Test.Common; using System.Threading; using System.Threading.Tasks; + +using Microsoft.DotNet.XUnitExtensions; + using Xunit; using Xunit.Abstractions; @@ -292,16 +295,16 @@ namespace System.Net.Http.Functional.Tests } } - [ActiveIssue(32000)] [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "WinRT stack can't set MaxConnectionsPerServer < 2")] - [Fact] + [ConditionalFact] public async Task MaxConnectionsPerServer_WaitingConnectionsAreCancelable() { - if (IsNetfxHandler) + if (IsNetfxHandler || IsCurlHandler) { // Throws HttpRequestException wrapping a WebException for the canceled request // instead of throwing an OperationCanceledException or a canceled WebException directly. - return; + // With CurlHandler, this test sometimes hangs. + throw new SkipTestException("Skipping on unstable platform handler"); } using (HttpClientHandler handler = CreateHttpClientHandler()) -- 2.7.4