From 0540ec259dec586472853fc66ca90b349693aeef Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 30 Oct 2019 09:50:07 -0700 Subject: [PATCH] Don't re-use requests (#15389) --- .../test/Helpers/AspNetProcess.cs | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/AspNetProcess.cs b/src/ProjectTemplates/test/Helpers/AspNetProcess.cs index 6222a5e8a1..c4415bf55f 100644 --- a/src/ProjectTemplates/test/Helpers/AspNetProcess.cs +++ b/src/ProjectTemplates/test/Helpers/AspNetProcess.cs @@ -104,11 +104,13 @@ namespace Templates.Test.Helpers public async Task ContainsLinks(Page page) { - var request = new HttpRequestMessage( - HttpMethod.Get, - new Uri(ListeningUri, page.Url)); - - var response = await RequestWithRetries(client => client.SendAsync(request), _httpClient); + var response = await RequestWithRetries(client => + { + var request = new HttpRequestMessage( + HttpMethod.Get, + new Uri(ListeningUri, page.Url)); + return client.SendAsync(request); + }, _httpClient); Assert.Equal(HttpStatusCode.OK, response.StatusCode); var parser = new HtmlParser(); @@ -235,16 +237,18 @@ namespace Templates.Test.Helpers public async Task AssertStatusCode(string requestUrl, HttpStatusCode statusCode, string acceptContentType = null) { - var request = new HttpRequestMessage( - HttpMethod.Get, - new Uri(ListeningUri, requestUrl)); + var response = await RequestWithRetries(client => { + var request = new HttpRequestMessage( + HttpMethod.Get, + new Uri(ListeningUri, requestUrl)); - if (!string.IsNullOrEmpty(acceptContentType)) - { - request.Headers.Add("Accept", acceptContentType); - } + if (!string.IsNullOrEmpty(acceptContentType)) + { + request.Headers.Add("Accept", acceptContentType); + } - var response = await RequestWithRetries(client => client.SendAsync(request), _httpClient); + return client.SendAsync(request); + }, _httpClient); Assert.True(statusCode == response.StatusCode, $"Expected {requestUrl} to have status '{statusCode}' but it was '{response.StatusCode}'."); }