From 5c16d05d4456fded6cfb08a69f2913c8575cf871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?= Date: Thu, 26 Mar 2020 10:41:27 +0100 Subject: [PATCH 1/2] Disable all PlatformHandlerTest_Cookies_Http2 for WinHttpHandler. --- .../tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs | 6 ------ .../tests/FunctionalTests/PlatformHandlerTest.cs | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs index 0c1b0f4c7a8b55..3fa53fe5a9be21 100644 --- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs +++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Cookies.cs @@ -331,12 +331,6 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async url => [MemberData(nameof(CookieNamesValuesAndUseCookies))] public async Task GetAsync_ReceiveSetCookieHeader_CookieAdded(string cookieName, string cookieValue, bool useCookies) { - if (UseVersion.Major == 2) - { - // [ActiveIssue("https://github.com/dotnet/runtime/issues/33930")] - return; - } - await LoopbackServerFactory.CreateServerAsync(async (server, url) => { HttpClientHandler handler = CreateHttpClientHandler(); diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs index 3bd5bc40488ff8..408303607511b5 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs @@ -193,6 +193,7 @@ public PlatformHandler_HttpClientHandler_Authentication_Test(ITestOutputHelper o } #if NETCOREAPP +#if !WINHTTPHANDLER_TEST [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows10Version1607OrGreater))] public sealed class PlatformHandlerTest_Cookies_Http2 : HttpClientHandlerTest_Cookies { @@ -200,6 +201,7 @@ public sealed class PlatformHandlerTest_Cookies_Http2 : HttpClientHandlerTest_Co public PlatformHandlerTest_Cookies_Http2(ITestOutputHelper output) : base(output) { } } +#endif public sealed class PlatformHandler_HttpClientHandler_Asynchrony_Http2_Test : HttpClientHandler_Asynchrony_Test { From 97e12eb6a8b1698ae3ed3fd89c29b04244f8a612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?= <11718369+ManickaP@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:02:51 +0100 Subject: [PATCH 2/2] Added ActiveIssue note. Co-Authored-By: Stephen Toub --- .../tests/FunctionalTests/PlatformHandlerTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs index 408303607511b5..d3c70163288397 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/FunctionalTests/PlatformHandlerTest.cs @@ -193,7 +193,7 @@ public PlatformHandler_HttpClientHandler_Authentication_Test(ITestOutputHelper o } #if NETCOREAPP -#if !WINHTTPHANDLER_TEST +#if !WINHTTPHANDLER_TEST // [ActiveIssue("https://github.com/dotnet/runtime/issues/33930")] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows10Version1607OrGreater))] public sealed class PlatformHandlerTest_Cookies_Http2 : HttpClientHandlerTest_Cookies {