Return HttpResponseMessage from RetryHelper

test/DeploymentHelpers/Common/RetryHelper.cs

@@ -15,7 +15,7 @@ namespace DeploymentHelpers
         /// <param name="logger"></param>
         /// <param name="cancellationToken"></param>
         /// <param name="retryCount"></param>
-        public static void RetryRequest(
+        public static HttpResponseMessage RetryRequest(
             Func<HttpResponseMessage> retryBlock,
             ILogger logger,
             CancellationToken cancellationToken = default(CancellationToken),
@@ -40,7 +40,7 @@ namespace DeploymentHelpers
                         continue;
                     }
 
-                    break; //Went through successfully
+                    return response; //Went through successfully
                 }
                 catch (AggregateException exception)
                 {
@@ -62,6 +62,8 @@ namespace DeploymentHelpers
                     }
                 }
             }
+
+            return null;
         }
     }
 }

test/E2ETests/NtlmAuthentationTest.cs

@@ -56,13 +56,10 @@ namespace E2ETests
                     var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true };
                     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 = RetryHelper.RetryRequest(() =>
                     {
-                        response = httpClient.GetAsync(string.Empty).Result;
+                        return httpClient.GetAsync(string.Empty).Result;
-                        return response;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);

test/E2ETests/OpenIdConnectTests.cs

@@ -65,13 +65,10 @@ namespace E2ETests
                     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 = RetryHelper.RetryRequest(() =>
                     {
-                        response = httpClient.GetAsync(string.Empty).Result;
+                        return httpClient.GetAsync(string.Empty).Result;
-                        return response;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);

test/E2ETests/PublishAndRunTests.cs

@@ -87,14 +87,11 @@ namespace E2ETests
                     var httpClientHandler = new HttpClientHandler() { UseDefaultCredentials = true };
                     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.
                     // Add retry logic since tests are flaky on mono due to connection issues
-                    RetryHelper.RetryRequest(() =>
+                    var response = RetryHelper.RetryRequest(() =>
                     {
-                        response = httpClient.GetAsync(string.Empty).Result;
+                        return httpClient.GetAsync(string.Empty).Result;
-                        return response;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);

test/E2ETests/SmokeTests.cs

@@ -156,13 +156,10 @@ namespace E2ETests
                     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 = RetryHelper.RetryRequest(() =>
                     {
-                        response = httpClient.GetAsync(string.Empty).Result;
+                        return httpClient.GetAsync(string.Empty).Result;
-                        return response;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);