github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix HttpClientTests, Use Servarr HttpBin Mirror

Browse source
This commit is contained in:
Qstick 2020-06-27 18:56:01 -04:00
commit 3af96f1863
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
View file

@ -46,7 +46,7 @@ namespace NzbDrone.Common.Test.Http
TestLogger.Info($"{candidates.Length} TestSites available."); TestLogger.Info($"{candidates.Length} TestSites available.");
_httpBinSleep = _httpBinHosts.Length < 2 ? 100 : 10; _httpBinSleep = _httpBinHosts.Count() < 2 ? 100 : 10;
} }
private bool IsTestSiteAvailable(string site) private bool IsTestSiteAvailable(string site)
@ -250,7 +250,7 @@ namespace NzbDrone.Common.Test.Http
[Test] [Test]
public void should_throw_on_too_many_redirects() public void should_throw_on_too_many_redirects()
{ {
var request = new HttpRequest($"https://{_httpBinHost}/redirect/4"); var request = new HttpRequest($"https://{_httpBinHost}/redirect/6");
request.AllowAutoRedirect = true; request.AllowAutoRedirect = true;
Assert.Throws<WebException>(() => Subject.Get(request)); Assert.Throws<WebException>(() => Subject.Get(request));

4
src/NzbDrone.Common/Http/HttpClient.cs
View file

@ -28,6 +28,8 @@ namespace NzbDrone.Common.Http
public class HttpClient : IHttpClient public class HttpClient : IHttpClient
{ {
private const int MaxRedirects = 5;
private readonly Logger _logger; private readonly Logger _logger;
private readonly IRateLimitService _rateLimitService; private readonly IRateLimitService _rateLimitService;
private readonly ICached<CookieContainer> _cookieContainerCache; private readonly ICached<CookieContainer> _cookieContainerCache;
@ -70,7 +72,7 @@ namespace NzbDrone.Common.Http
_logger.Trace("Redirected to {0}", request.Url); _logger.Trace("Redirected to {0}", request.Url);
if (autoRedirectChain.Count > 3) if (autoRedirectChain.Count > MaxRedirects)
{ {
throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError); throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError);
} }