Backup_Repos/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2026-05-07 12:30:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge 3d78109896 into bf5d48c76a

Browse source
This commit is contained in:
Bogdan 2026-05-05 16:00:23 +03:00 committed by GitHub
commit b2396644b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 58 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -52,6 +52,8 @@ dotnet_diagnostic.IDE0005.severity = error
dotnet_diagnostic.IDE0007.severity = error
# Inline variable declaration
dotnet_diagnostic.IDE0018.severity = error
# Call async methods when in an async method
dotnet_diagnostic.CA1849.severity = warning
# Stylecop Rules
dotnet_diagnostic.SA0001.severity = none

4
.github/actions/test/action.yml vendored
View file

@ -52,14 +52,14 @@ runs:
echo "Sonarr__Postgres__Password=postgres" >> "$GITHUB_ENV"
- name: Download Artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v8
with:
name: ${{ inputs.artifact }}
path: _tests
- name: Download Binary Artifact
if: ${{ inputs.integration_tests }}
uses: actions/download-artifact@v5
uses: actions/download-artifact@v8
with:
name: ${{ inputs.binary_artifact }}
path: _output

2
.github/workflows/build_v5.yml vendored
View file

@ -100,7 +100,7 @@ jobs:
uses: actions/checkout@v6
- name: Volta
uses: volta-cli/action@v4
uses: volta-cli/action@v5
- name: Yarn Install
run: yarn install

6
src/Directory.Build.props
View file

@ -122,9 +122,9 @@
<PackageReference Include="coverlet.collector" Version="6.0.4" />
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="NunitXml.TestLogger" Version="8.0.0" />
</ItemGroup>
<PropertyGroup Condition="'$(SonarrProject)'=='true' and '$(EnableAnalyzers)'=='false'">

4
src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs
View file

@ -981,7 +981,7 @@ private void VerifyCopyFolder(string source, string destination)
var sourceFiles = Directory.GetFileSystemEntries(source, "*", SearchOption.AllDirectories).Select(v => v.Substring(source.Length + 1)).ToArray();
var destFiles = Directory.GetFileSystemEntries(destination, "*", SearchOption.AllDirectories).Select(v => v.Substring(destination.Length + 1)).ToArray();
CollectionAssert.AreEquivalent(sourceFiles, destFiles);
Assert.That(sourceFiles, Is.EquivalentTo(destFiles));
}
private void VerifyMoveFolder(string source, string from, string destination)
@ -991,7 +991,7 @@ private void VerifyMoveFolder(string source, string from, string destination)
var sourceFiles = Directory.GetFileSystemEntries(source, "*", SearchOption.AllDirectories).Select(v => v.Substring(source.Length + 1)).ToArray();
var destFiles = Directory.GetFileSystemEntries(destination, "*", SearchOption.AllDirectories).Select(v => v.Substring(destination.Length + 1)).ToArray();
CollectionAssert.AreEquivalent(sourceFiles, destFiles);
Assert.That(sourceFiles, Is.EquivalentTo(destFiles));
}
private void VerifyDeletedFile(string filePath)

6
src/NzbDrone.Common/Http/HappyEyeballs/HappyEyeballs.cs
View file

@ -131,7 +131,9 @@ private async Task<TSocket> ParallelTask(
await delayCts.CancelAsync().ConfigureAwait(false);
await timeoutTask.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing);
#pragma warning disable CA1849
completedTask = whenAnyDone.Result;
#pragma warning restore CA1849
}
else
{
@ -165,7 +167,9 @@ private async Task<TSocket> ParallelTask(
{
if (task.IsCompletedSuccessfully)
{
#pragma warning disable CA1849
task.Result.Dispose();
#pragma warning restore CA1849
}
}
@ -176,6 +180,8 @@ private async Task<TSocket> ParallelTask(
throw new AggregateException(innerExceptions);
}
#pragma warning disable CA1849
return successTask.Result;
#pragma warning restore CA1849
}
}

3
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using FluentAssertions;
using Moq;
using NLog;
@ -39,7 +38,7 @@ public void SetupBase()
Mocker.GetMock<IHttpClient>()
.Setup(s => s.GetAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Array.Empty<byte>())));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Array.Empty<byte>()));
Mocker.GetMock<IRemotePathMappingService>()
.Setup(v => v.RemapRemoteToLocal(It.IsAny<string>(), It.IsAny<OsPath>()))

2
src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs
View file

@ -105,7 +105,7 @@ protected void GivenSuccessfulDownload()
{
Mocker.GetMock<IHttpClient>()
.Setup(s => s.GetAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), new byte[1000])));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), new byte[1000]));
Mocker.GetMock<IHadoukenProxy>()
.Setup(s => s.AddTorrentUri(It.IsAny<HadoukenSettings>(), It.IsAny<string>()))

14
src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs
View file

@ -111,31 +111,31 @@ private List<SearchCriteriaBase> WatchForSearchCriteria()
_mockIndexer.Setup(v => v.Fetch(It.IsAny<SingleEpisodeSearchCriteria>()))
.Callback<SingleEpisodeSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<SeasonSearchCriteria>()))
.Callback<SeasonSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<DailyEpisodeSearchCriteria>()))
.Callback<DailyEpisodeSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<DailySeasonSearchCriteria>()))
.Callback<DailySeasonSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<AnimeEpisodeSearchCriteria>()))
.Callback<AnimeEpisodeSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<AnimeSeasonSearchCriteria>()))
.Callback<AnimeSeasonSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
_mockIndexer.Setup(v => v.Fetch(It.IsAny<SpecialEpisodeSearchCriteria>()))
.Callback<SpecialEpisodeSearchCriteria>(s => result.Add(s))
.Returns(Task.FromResult<IList<Parser.Model.ReleaseInfo>>(new List<Parser.Model.ReleaseInfo>()));
.ReturnsAsync(new List<Parser.Model.ReleaseInfo>());
return result;
}

7
src/NzbDrone.Core.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs
View file

@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
@ -38,11 +37,11 @@ public void Setup()
Mocker.GetMock<ISearchForReleases>()
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, false, true, false))
.Returns(Task.FromResult(new List<DownloadDecision>()));
.ReturnsAsync(new List<DownloadDecision>());
Mocker.GetMock<IProcessDownloadDecisions>()
.Setup(s => s.ProcessDecisions(It.IsAny<List<DownloadDecision>>()))
.Returns(Task.FromResult(new ProcessedDecisions(new List<DownloadDecision>(), new List<DownloadDecision>(), new List<DownloadDecision>())));
.ReturnsAsync(new ProcessedDecisions(new List<DownloadDecision>(), new List<DownloadDecision>(), new List<DownloadDecision>()));
}
[Test]
@ -91,7 +90,7 @@ public void should_start_with_lower_seasons_first()
Mocker.GetMock<ISearchForReleases>()
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, true, false))
.Returns(Task.FromResult(new List<DownloadDecision>()))
.ReturnsAsync(new List<DownloadDecision>())
.Callback<int, int, bool, bool, bool, bool>((seriesId, seasonNumber, missingOnly, monitoredOnly, userInvokedSearch, interactiveSearch) => seasonOrder.Add(seasonNumber));
Subject.Execute(new SeriesSearchCommand { SeriesId = _series.Id, Trigger = CommandTrigger.Manual });

12
src/NzbDrone.Core.Test/IndexerTests/BroadcastheNetTests/BroadcastheNetFixture.cs
View file

@ -34,7 +34,7 @@ public async Task should_parse_recent_feed_from_BroadcastheNet()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -79,7 +79,7 @@ public async Task should_back_off_on_bad_request()
{
Mocker.GetMock<IHttpClient>()
.Setup(v => v.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.BadRequest)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.BadRequest));
var results = await Subject.FetchRecent();
@ -95,7 +95,7 @@ public async Task should_back_off_and_report_api_key_invalid()
{
Mocker.GetMock<IHttpClient>()
.Setup(v => v.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.Unauthorized)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.Unauthorized));
var results = await Subject.FetchRecent();
@ -111,7 +111,7 @@ public async Task should_back_off_on_unknown_method()
{
Mocker.GetMock<IHttpClient>()
.Setup(v => v.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.NotFound)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.NotFound));
var results = await Subject.FetchRecent();
@ -127,7 +127,7 @@ public async Task should_back_off_api_limit_reached()
{
Mocker.GetMock<IHttpClient>()
.Setup(v => v.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.ServiceUnavailable)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Array.Empty<byte>(), System.Net.HttpStatusCode.ServiceUnavailable));
var results = await Subject.FetchRecent();
@ -149,7 +149,7 @@ public async Task should_replace_https_http_as_needed()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();

2
src/NzbDrone.Core.Test/IndexerTests/FanzubTests/FanzubFixture.cs
View file

@ -32,7 +32,7 @@ public async Task should_parse_recent_feed_from_fanzub()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();

2
src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
View file

@ -33,7 +33,7 @@ public async Task should_parse_recent_feed_from_FileList()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader { { "Content-Type", "application/json" } }, recentFeed));
var releases = await Subject.FetchRecent();

4
src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsFixture.cs
View file

@ -37,7 +37,7 @@ public async Task should_parse_recent_feed_from_HDBits(string fileName)
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Post)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), responseJson)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), responseJson));
var torrents = await Subject.FetchRecent();
@ -66,7 +66,7 @@ public async Task should_warn_on_wrong_passkey()
Mocker.GetMock<IHttpClient>()
.Setup(v => v.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), Encoding.UTF8.GetBytes(responseJson))));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), Encoding.UTF8.GetBytes(responseJson)));
var torrents = await Subject.FetchRecent();

2
src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs
View file

@ -91,7 +91,7 @@ public async Task should_parse_recent_feed_from_IPTorrents()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();

8
src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
View file

@ -49,7 +49,7 @@ public async Task should_parse_recent_feed_from_newznab_nzb_su()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -75,7 +75,7 @@ public async Task should_parse_recent_feed_from_newznab_animetosho()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -145,7 +145,7 @@ public async Task should_parse_languages()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -173,7 +173,7 @@ public async Task should_parse_indexer_flags(string releaseGuid, params IndexerF
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), feed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), feed));
var releases = await Subject.FetchRecent();

2
src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs
View file

@ -65,7 +65,7 @@ public async Task should_parse_2021_recent_feed_from_Nyaa()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();

3
src/NzbDrone.Core.Test/IndexerTests/SeasonSearchFixture.cs
View file

@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
using FizzWare.NBuilder;
using Moq;
using NUnit.Framework;
@ -25,7 +24,7 @@ public void Setup()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), "<xml></xml>")));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), "<xml></xml>"));
}
private void WithIndexer(bool paging, int resultCount)

2
src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs
View file

@ -37,7 +37,7 @@ private void GivenRecentFeedResponse(string rssXmlFile)
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
Mocker.GetMock<IHttpClient>()
.Setup(o => o.Execute(It.IsAny<HttpRequest>()))

2
src/NzbDrone.Core.Test/IndexerTests/TorrentleechTests/TorrentleechFixture.cs
View file

@ -33,7 +33,7 @@ public async Task should_parse_recent_feed_from_Torrentleech()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();

10
src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
View file

@ -51,7 +51,7 @@ public async Task should_parse_recent_feed_from_torznab_hdaccess_net()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -82,7 +82,7 @@ public async Task should_parse_recent_feed_from_torznab_tpb()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -112,7 +112,7 @@ public async Task should_parse_recent_feed_from_torznab_animetosho()
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var releases = await Subject.FetchRecent();
@ -175,7 +175,7 @@ public void jackett_all_url_should_not_validate(string baseUrl)
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
var result = new NzbDroneValidationResult(Subject.Test());
result.IsValid.Should().BeTrue();
@ -190,7 +190,7 @@ public void jackett_all_api_should_not_validate(string apiPath)
Mocker.GetMock<IHttpClient>()
.Setup(o => o.ExecuteAsync(It.Is<HttpRequest>(v => v.Method == HttpMethod.Get)))
.Returns<HttpRequest>(r => Task.FromResult(new HttpResponse(r, new HttpHeader(), recentFeed)));
.ReturnsAsync((HttpRequest r) => new HttpResponse(r, new HttpHeader(), recentFeed));
(Subject.Definition.Settings as TorznabSettings).ApiPath = apiPath;

9
src/NzbDrone.Integration.Test/IntegrationTestBase.cs
View file

@ -179,10 +179,9 @@ protected async Task ConnectSignalR()
var cts = new CancellationTokenSource();
_signalrConnection.Closed += e =>
_signalrConnection.Closed += async _ =>
{
cts.Cancel();
return Task.CompletedTask;
await cts.CancelAsync();
};
_signalrConnection.On<SignalRMessage>("receiveMessage", (message) =>
@ -199,7 +198,7 @@ protected async Task ConnectSignalR()
{
Console.WriteLine("Connecting to signalR");
await _signalrConnection.StartAsync();
await _signalrConnection.StartAsync(cts.Token);
connected = true;
break;
}
@ -212,7 +211,7 @@ protected async Task ConnectSignalR()
}
retryCount++;
Thread.Sleep(200);
await Task.Delay(200, cts.Token);
}
}

4
src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj
View file

@ -3,11 +3,11 @@
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="FluentAssertions" Version="7.2.2" />
<PackageReference Include="FluentValidation" Version="9.5.4" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NLog" Version="5.5.1" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="RestSharp" Version="106.15.0" />
</ItemGroup>
<ItemGroup>