aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2026-11-12 19:28:58 +0100
committerGitHub <noreply@github.com>2026-11-12 19:28:58 +0100
commit4ac3c8f357113d0c850ff9b3d6d201377b96afd3 (patch)
tree9fac607473c498898038cfa2ee8d062df1aca75e /tests
parentca65685f91d45519a76c91878aa30f03e7369d6d (diff)
parentee3a982374c0df337af5b78e0e6eef95f47d551b (diff)
Merge pull request #17811 from Shadowghost/port-async-migration-routines
Migrate to IAsyncMigrationRoutine
Diffstat (limited to 'tests')
-rw-r--r--tests/Jellyfin.Server.Tests/Migrations/FixNullEncoderPresetTests.cs2
-rw-r--r--tests/Jellyfin.Server.Tests/Migrations/MigrateLinkedChildrenStaleItemsTests.cs31
2 files changed, 17 insertions, 16 deletions
diff --git a/tests/Jellyfin.Server.Tests/Migrations/FixNullEncoderPresetTests.cs b/tests/Jellyfin.Server.Tests/Migrations/FixNullEncoderPresetTests.cs
index b41ecbb8ed..baa7909929 100644
--- a/tests/Jellyfin.Server.Tests/Migrations/FixNullEncoderPresetTests.cs
+++ b/tests/Jellyfin.Server.Tests/Migrations/FixNullEncoderPresetTests.cs
@@ -102,7 +102,7 @@ public sealed class FixNullEncoderPresetTests : IDisposable
_configurationDirectory);
var migration = new MigrateEncodingOptions(applicationPaths, NullLoggerFactory.Instance);
- migration.Perform();
+ await migration.PerformAsync(TestContext.Current.CancellationToken);
var serializer = new XmlSerializer(typeof(EncodingOptions));
using var reader = XmlReader.Create(_encodingConfigurationPath);
diff --git a/tests/Jellyfin.Server.Tests/Migrations/MigrateLinkedChildrenStaleItemsTests.cs b/tests/Jellyfin.Server.Tests/Migrations/MigrateLinkedChildrenStaleItemsTests.cs
index 92fc1dca97..03d39c0ee7 100644
--- a/tests/Jellyfin.Server.Tests/Migrations/MigrateLinkedChildrenStaleItemsTests.cs
+++ b/tests/Jellyfin.Server.Tests/Migrations/MigrateLinkedChildrenStaleItemsTests.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
+using System.Threading.Tasks;
using Jellyfin.Database.Implementations;
using Jellyfin.Database.Implementations.Entities;
using Jellyfin.Database.Implementations.Locking;
@@ -54,18 +55,18 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
private string LibraryDefinitionRoot => Path.Combine(_root, "root", "default");
[Fact]
- public void Perform_NoLibraryLocationsResolved_KeepsEverything()
+ public async Task Perform_NoLibraryLocationsResolved_KeepsEverything()
{
var itemId = Guid.Parse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa");
SeedItem(itemId, SeedMediaFile("kept.flac"));
- var deleted = Perform(libraryLocations: []);
+ var deleted = await PerformAsync(libraryLocations: []);
Assert.Empty(deleted);
}
[Fact]
- public void Perform_ItemOutsideEveryLocation_IsRemoved()
+ public async Task Perform_ItemOutsideEveryLocation_IsRemoved()
{
var itemId = Guid.Parse("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb");
@@ -74,36 +75,36 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
SeedMediaFile("anchor.flac");
SeedItem(itemId, Path.Combine(_root, "removed-media", "gone.flac"));
- var deleted = Perform(libraryLocations: [Path.Combine(_root, "media")]);
+ var deleted = await PerformAsync(libraryLocations: [Path.Combine(_root, "media")]);
Assert.Equal([itemId], deleted);
}
[Fact]
- public void Perform_ItemInsideLocationWithMissingFile_IsRemoved()
+ public async Task Perform_ItemInsideLocationWithMissingFile_IsRemoved()
{
var itemId = Guid.Parse("cccccccc-cccc-cccc-cccc-cccccccccccc");
SeedMediaFile("anchor.flac");
SeedItem(itemId, Path.Combine(_root, "media", "deleted.flac"));
- var deleted = Perform(libraryLocations: [Path.Combine(_root, "media")]);
+ var deleted = await PerformAsync(libraryLocations: [Path.Combine(_root, "media")]);
Assert.Equal([itemId], deleted);
}
[Fact]
- public void Perform_ItemInsideLocationWithFilePresent_IsKept()
+ public async Task Perform_ItemInsideLocationWithFilePresent_IsKept()
{
var itemId = Guid.Parse("dddddddd-dddd-dddd-dddd-dddddddddddd");
SeedItem(itemId, SeedMediaFile("present.flac"));
- var deleted = Perform(libraryLocations: [Path.Combine(_root, "media")]);
+ var deleted = await PerformAsync(libraryLocations: [Path.Combine(_root, "media")]);
Assert.Empty(deleted);
}
[Fact]
- public void Perform_LibraryDefinitionMissing_KeepsItsItems()
+ public async Task Perform_LibraryDefinitionMissing_KeepsItsItems()
{
var libraryId = Guid.Parse("11111111-1111-1111-1111-111111111111");
var itemId = Guid.Parse("22222222-2222-2222-2222-222222222222");
@@ -114,13 +115,13 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
SeedMediaFile("anchor.flac");
SeedItem(itemId, Path.Combine(_root, "movies", "kept.mkv"), libraryId);
- var deleted = Perform(libraryLocations: [Path.Combine(_root, "media")]);
+ var deleted = await PerformAsync(libraryLocations: [Path.Combine(_root, "media")]);
Assert.Empty(deleted);
}
[Fact]
- public void Perform_PathRemovedFromSurvivingLibrary_IsRemoved()
+ public async Task Perform_PathRemovedFromSurvivingLibrary_IsRemoved()
{
var libraryId = Guid.Parse("33333333-3333-3333-3333-333333333333");
var itemId = Guid.Parse("44444444-4444-4444-4444-444444444444");
@@ -131,7 +132,7 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
SeedMediaFile("anchor.flac");
SeedItem(itemId, Path.Combine(_root, "removed-media", "gone.flac"), libraryId);
- var deleted = Perform(libraryLocations: [Path.Combine(_root, "media")]);
+ var deleted = await PerformAsync(libraryLocations: [Path.Combine(_root, "media")]);
Assert.Equal([itemId], deleted);
}
@@ -200,7 +201,7 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
}
}
- private IReadOnlyList<Guid> Perform(string[] libraryLocations, string libraryName = "Media")
+ private async Task<IReadOnlyList<Guid>> PerformAsync(string[] libraryLocations, string libraryName = "Media")
{
var deleted = new List<Guid>();
@@ -229,13 +230,13 @@ public sealed class MigrateLinkedChildrenStaleItemsTests : IDisposable
factory.Setup(f => f.CreateDbContext()).Returns(CreateDbContext);
factory.Setup(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>())).ReturnsAsync(CreateDbContext);
- new MigrateLinkedChildren(
+ await new MigrateLinkedChildren(
NullLoggerFactory.Instance,
factory.Object,
libraryManager.Object,
appHost.Object,
appPaths.Object)
- .Perform();
+ .PerformAsync(TestContext.Current.CancellationToken);
return deleted;
}