From 0ce85e2ea2ca24471f9208d66ab385b04c23d6d5 Mon Sep 17 00:00:00 2001 From: Chris R Date: Tue, 18 Apr 2017 09:41:30 -0700 Subject: [PATCH] #263 Add Caching_SetTtlAndStatusCode_Cached test diagnostics --- .../Listener/ResponseCachingTests.cs | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseCachingTests.cs b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseCachingTests.cs index f731bbdd63..1505fd1dba 100644 --- a/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseCachingTests.cs +++ b/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseCachingTests.cs @@ -560,13 +560,28 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener context.Response.CacheTtl = TimeSpan.FromSeconds(10); context.Dispose(); - var response = await responseTask; + HttpResponseMessage response; + try + { + response = await responseTask; + } + catch (Exception ex) + { + throw new Exception($"Failed to get first response for {status}", ex); + } Assert.Equal(status, (int)response.StatusCode); Assert.Equal(status.ToString(), response.Headers.GetValues("x-request-count").FirstOrDefault()); Assert.Equal(new byte[0], await response.Content.ReadAsByteArrayAsync()); // Send a second request and make sure we get the same response (without listening for one on the server). - response = await SendRequestAsync(address + status); + try + { + response = await SendRequestAsync(address + status); + } + catch (Exception ex) + { + throw new Exception($"Failed to get second response for {status}", ex); + } Assert.Equal(status, (int)response.StatusCode); Assert.Equal(status.ToString(), response.Headers.GetValues("x-request-count").FirstOrDefault()); Assert.Equal(new byte[0], await response.Content.ReadAsByteArrayAsync()); @@ -1137,7 +1152,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener { using (var handler = new HttpClientHandler() { AllowAutoRedirect = false }) { - using (var client = new HttpClient(handler) { Timeout = TimeSpan.FromSeconds(5) }) + using (var client = new HttpClient(handler) { Timeout = Utilities.DefaultTimeout }) { var request = new HttpRequestMessage(new HttpMethod(method), uri); if (!string.IsNullOrEmpty(extraHeader))