aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Barron <barronpm@gmail.com>2023-11-10 08:51:26 -0500
committerPatrick Barron <barronpm@gmail.com>2023-11-10 08:51:26 -0500
commitb0120d5d4ce787c2a44f2d172d0760b545804e0f (patch)
tree9b93875e84d201f52d81db34d477ab455b72ec0e
parent1e1e1560a47439c02931e67736bcd87b606cf35c (diff)
Fix integration tests
-rw-r--r--tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs21
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs b/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
index 1c87d11f1..a078eff77 100644
--- a/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/JellyfinApplicationFactory.cs
@@ -8,9 +8,9 @@ using Jellyfin.Server.Helpers;
using MediaBrowser.Common;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Serilog;
@@ -39,9 +39,9 @@ namespace Jellyfin.Server.Integration.Tests
}
/// <inheritdoc/>
- protected override IWebHostBuilder CreateWebHostBuilder()
+ protected override IHostBuilder CreateHostBuilder()
{
- return new WebHostBuilder();
+ return new HostBuilder();
}
/// <inheritdoc/>
@@ -95,18 +95,17 @@ namespace Jellyfin.Server.Integration.Tests
}
/// <inheritdoc/>
- protected override TestServer CreateServer(IWebHostBuilder builder)
+ protected override IHost CreateHost(IHostBuilder builder)
{
- // Create the test server using the base implementation
- var testServer = base.CreateServer(builder);
-
- // Finish initializing the app host
- var appHost = (TestAppHost)testServer.Services.GetRequiredService<IApplicationHost>();
- appHost.ServiceProvider = testServer.Services;
+ var host = builder.Build();
+ var appHost = (TestAppHost)host.Services.GetRequiredService<IApplicationHost>();
+ appHost.ServiceProvider = host.Services;
appHost.InitializeServices().GetAwaiter().GetResult();
+ host.Start();
+
appHost.RunStartupTasksAsync().GetAwaiter().GetResult();
- return testServer;
+ return host;
}
/// <inheritdoc/>