huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return HttpResponseMessage from RetryHelper

This commit is contained in:
Praburaj 2015-04-15 23:15:12 -07:00
parent 0823c5802c
commit 9c8fa0f3f9
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/DeploymentHelpers/Common/RetryHelper.cs
View File

@ -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;
}
}
}

7
test/E2ETests/NtlmAuthentationTest.cs
View File

@ -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);

7
test/E2ETests/OpenIdConnectTests.cs
View File

@ -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);

7
test/E2ETests/PublishAndRunTests.cs
View File

@ -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);

7
test/E2ETests/SmokeTests.cs
View File

@ -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);