From 54a8d8f8de575ddcdf7779b06051c43d77c26f01 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 16 Apr 2015 16:23:22 -0700 Subject: [PATCH] Change to async retry helper. --- test/ServerComparison.FunctionalTests/HelloWorldTest.cs | 9 +++------ .../NtlmAuthentationTest.cs | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs index 77f9c631b1..724f8df513 100644 --- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs @@ -100,14 +100,11 @@ namespace ServerComparison.FunctionalTests var httpClientHandler = new HttpClientHandler(); var httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) }; - HttpResponseMessage response = null; - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - RetryHelper.RetryRequest(() => + var response = await RetryHelper.RetryRequest(() => { - response = httpClient.GetAsync(string.Empty).Result; - return response; - }, logger: logger); + return httpClient.GetAsync(string.Empty); + }, logger, deploymentResult.HostShutdownToken); logger.LogInformation("[Time]: Approximate time taken for application initialization : '{t}' seconds", stopwatch.Elapsed.TotalSeconds); diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs b/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs index 01b1d67629..4b13376170 100644 --- a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs @@ -50,14 +50,11 @@ namespace ServerComparison.FunctionalTests var httpClientHandler = new HttpClientHandler(); var httpClient = new HttpClient(httpClientHandler) { BaseAddress = new Uri(deploymentResult.ApplicationBaseUri) }; - HttpResponseMessage response = null; - // Request to base address and check if various parts of the body are rendered & measure the cold startup time. - RetryHelper.RetryRequest(() => + var response = await RetryHelper.RetryRequest(() => { - response = httpClient.GetAsync(string.Empty).Result; - return response; - }, logger: logger); + return httpClient.GetAsync(string.Empty); + }, logger, deploymentResult.HostShutdownToken); logger.LogInformation("[Time]: Approximate time taken for application initialization : '{t}' seconds", stopwatch.Elapsed.TotalSeconds);