From 4ee7a259904a7a8e947576cf44e6fe9b3527485b Mon Sep 17 00:00:00 2001
From: Karel Zikmund <karelz@microsoft.com>
Date: Wed, 28 Jul 2021 21:22:51 +0200
Subject: [PATCH 1/2] Disable test
 ResponseHeadersRead_SynchronizationContextNotUsedByHandler for WinHttpHandler
 on Win7/Win81

---
 .../System/Net/Http/HttpClientHandlerTest.Asynchrony.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
index 6834f839b41907..0e7491e76dca77 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
@@ -26,6 +26,11 @@ from contentMode in Enum.GetValues(typeof(LoopbackServer.ContentMode)).Cast<Loop
         [MemberData(nameof(ResponseHeadersRead_SynchronizationContextNotUsedByHandler_MemberData))]
         public async Task ResponseHeadersRead_SynchronizationContextNotUsedByHandler(bool responseHeadersRead, LoopbackServer.ContentMode contentMode)
         {
+            if (IsWinHttpHandler && (PlatformDetection.IsWindows7 || PlatformDetection.IsWindows8x))
+            {   // [ActiveIssue("https://github.com/dotnet/runtime/issues/54034")]
+                throw new SkipTestException("Win7/Win81 environment often hangs the test for WinHttpHandler.");
+            }
+
             await Task.Run(async delegate // escape xunit's sync ctx
             {
                 await LoopbackServer.CreateClientAndServerAsync(uri =>

From 6ba60a0b0db20d26e2238be0379a956f10892428 Mon Sep 17 00:00:00 2001
From: Karel Zikmund <karelz@microsoft.com>
Date: Wed, 28 Jul 2021 23:23:03 +0200
Subject: [PATCH 2/2] Simplify skipping test

---
 .../tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
index 0e7491e76dca77..8762b4dbfa9348 100644
--- a/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
+++ b/src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.Asynchrony.cs
@@ -28,7 +28,7 @@ public async Task ResponseHeadersRead_SynchronizationContextNotUsedByHandler(boo
         {
             if (IsWinHttpHandler && (PlatformDetection.IsWindows7 || PlatformDetection.IsWindows8x))
             {   // [ActiveIssue("https://github.com/dotnet/runtime/issues/54034")]
-                throw new SkipTestException("Win7/Win81 environment often hangs the test for WinHttpHandler.");
+                return;
             }
 
             await Task.Run(async delegate // escape xunit's sync ctx