From d85c77a2c8b933bf88b1d61886678e39ee4a0696 Mon Sep 17 00:00:00 2001 From: Miha Zupan Date: Thu, 29 Jul 2021 11:47:37 -0700 Subject: [PATCH] Add timeouts to SendAsync_CorrectVersionSelected_LoopbackServer (#56546) --- .../System.Net.Http/tests/FunctionalTests/HttpClientTest.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs index 26a01e5..1cd8ede 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientTest.cs @@ -1170,6 +1170,8 @@ namespace System.Net.Http.Functional.Tests handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator; } using HttpClient client = CreateHttpClient(handler); + client.Timeout = TimeSpan.FromSeconds(30); + if (expectedResult is Type type) { Exception exception = await Assert.ThrowsAnyAsync(() => client.SendAsync(request)); @@ -1186,10 +1188,10 @@ namespace System.Net.Http.Functional.Tests { try { - HttpRequestData requestData = await server.AcceptConnectionSendResponseAndCloseAsync(); + HttpRequestData requestData = await server.HandleRequestAsync().WaitAsync(TimeSpan.FromSeconds(30)); Assert.Equal(expectedResult, requestData.Version); } - catch (Exception ex) when (expectedResult is Type) + catch (Exception ex) when (ex is not TaskCanceledException && expectedResult is Type) { _output.WriteLine("Server exception: " + ex.ToString()); } -- 2.7.4