mirror of
https://github.com/osukey/osukey.git
synced 2025-06-24 04:38:02 +09:00
Use OsuStorage
in realm tests to allow for migration
Also changes the realm filename to use `client` to match the ignore rules in `OsuStorage`. Without doing this, migration will fail in an indefinite mutex wait when attempting to delete the realm `.note` file.
This commit is contained in:
parent
a076eda834
commit
8e6c7eb030
@ -10,6 +10,7 @@ using osu.Framework.Logging;
|
|||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Framework.Testing;
|
using osu.Framework.Testing;
|
||||||
using osu.Game.Database;
|
using osu.Game.Database;
|
||||||
|
using osu.Game.IO;
|
||||||
using osu.Game.Models;
|
using osu.Game.Models;
|
||||||
|
|
||||||
#nullable enable
|
#nullable enable
|
||||||
@ -27,15 +28,16 @@ namespace osu.Game.Tests.Database
|
|||||||
storage.DeleteDirectory(string.Empty);
|
storage.DeleteDirectory(string.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void RunTestWithRealm(Action<RealmContextFactory, Storage> testAction, [CallerMemberName] string caller = "")
|
protected void RunTestWithRealm(Action<RealmContextFactory, OsuStorage> testAction, [CallerMemberName] string caller = "")
|
||||||
{
|
{
|
||||||
using (HeadlessGameHost host = new CleanRunHeadlessGameHost(caller))
|
using (HeadlessGameHost host = new CleanRunHeadlessGameHost(caller))
|
||||||
{
|
{
|
||||||
host.Run(new RealmTestGame(() =>
|
host.Run(new RealmTestGame(() =>
|
||||||
{
|
{
|
||||||
var testStorage = storage.GetStorageForDirectory(caller);
|
// ReSharper disable once AccessToDisposedClosure
|
||||||
|
var testStorage = new OsuStorage(host, storage.GetStorageForDirectory(caller));
|
||||||
|
|
||||||
using (var realmFactory = new RealmContextFactory(testStorage, caller))
|
using (var realmFactory = new RealmContextFactory(testStorage, "client"))
|
||||||
{
|
{
|
||||||
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}");
|
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}");
|
||||||
testAction(realmFactory, testStorage);
|
testAction(realmFactory, testStorage);
|
||||||
@ -58,7 +60,7 @@ namespace osu.Game.Tests.Database
|
|||||||
{
|
{
|
||||||
var testStorage = storage.GetStorageForDirectory(caller);
|
var testStorage = storage.GetStorageForDirectory(caller);
|
||||||
|
|
||||||
using (var realmFactory = new RealmContextFactory(testStorage, caller))
|
using (var realmFactory = new RealmContextFactory(testStorage, "client"))
|
||||||
{
|
{
|
||||||
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}");
|
Logger.Log($"Running test using realm file {testStorage.GetFullPath(realmFactory.Filename)}");
|
||||||
await testAction(realmFactory, testStorage);
|
await testAction(realmFactory, testStorage);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user