Merge in 'release/5.0' changes

dotnet-bot · dotnet-bot · commit 855283979d78 · 2021-01-15T16:44:16.000Z
diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs
@@ -1657,6 +1657,7 @@ public static IEnumerable<object[]> KeepAliveTestDataSource()
         [OuterLoop("Significant delay.")]
         [MemberData(nameof(KeepAliveTestDataSource))]
         [ConditionalTheory(nameof(SupportsAlpn))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/41929")]
         public async Task Http2_PingKeepAlive(TimeSpan keepAlivePingDelay, HttpKeepAlivePingPolicy keepAlivePingPolicy, bool expectRequestFail)
         {
             TimeSpan pingTimeout = TimeSpan.FromSeconds(5);

Original file line number	Diff line number	Diff line change
`@@ -1657,6 +1657,7 @@ public static IEnumerable<object[]> KeepAliveTestDataSource()`
`1657`	`1657`	`[OuterLoop("Significant delay.")]`
`1658`	`1658`	`[MemberData(nameof(KeepAliveTestDataSource))]`
`1659`	`1659`	`[ConditionalTheory(nameof(SupportsAlpn))]`
	`1660`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/41929")]`
`1660`	`1661`	`public async Task Http2_PingKeepAlive(TimeSpan keepAlivePingDelay, HttpKeepAlivePingPolicy keepAlivePingPolicy, bool expectRequestFail)`
`1661`	`1662`	`{`
`1662`	`1663`	`TimeSpan pingTimeout = TimeSpan.FromSeconds(5);`