From 9c8fa0f3f9f08abbed921bc238022a9d8f11c108 Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Wed, 15 Apr 2015 23:15:12 -0700
Subject: [PATCH] Return HttpResponseMessage from RetryHelper

---
 test/DeploymentHelpers/Common/RetryHelper.cs | 6 ++++--
 test/E2ETests/NtlmAuthentationTest.cs        | 7 ++-----
 test/E2ETests/OpenIdConnectTests.cs          | 7 ++-----
 test/E2ETests/PublishAndRunTests.cs          | 7 ++-----
 test/E2ETests/SmokeTests.cs                  | 7 ++-----
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/test/DeploymentHelpers/Common/RetryHelper.cs b/test/DeploymentHelpers/Common/RetryHelper.cs
index 106b97282c..4be9fb946b 100644
--- a/test/DeploymentHelpers/Common/RetryHelper.cs
+++ b/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;
         }
     }
 }
\ No newline at end of file
diff --git a/test/E2ETests/NtlmAuthentationTest.cs b/test/E2ETests/NtlmAuthentationTest.cs
index 93ece6beb5..537703dfca 100644
--- a/test/E2ETests/NtlmAuthentationTest.cs
+++ b/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 response;
+                        return httpClient.GetAsync(string.Empty).Result;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);
diff --git a/test/E2ETests/OpenIdConnectTests.cs b/test/E2ETests/OpenIdConnectTests.cs
index f18a556c5f..6366f884fd 100644
--- a/test/E2ETests/OpenIdConnectTests.cs
+++ b/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 response;
+                        return httpClient.GetAsync(string.Empty).Result;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);
diff --git a/test/E2ETests/PublishAndRunTests.cs b/test/E2ETests/PublishAndRunTests.cs
index dfcc9d9ca5..4c8fe841af 100644
--- a/test/E2ETests/PublishAndRunTests.cs
+++ b/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 response;
+                        return httpClient.GetAsync(string.Empty).Result;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);
diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs
index 7a04767ebf..c0f2927dd0 100644
--- a/test/E2ETests/SmokeTests.cs
+++ b/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 response;
+                        return httpClient.GetAsync(string.Empty).Result;
                     }, logger: logger, cancellationToken: deploymentResult.HostShutdownToken);
 
                     var validator = new Validator(httpClient, httpClientHandler, logger, deploymentResult);