h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 06:09:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #34478 from smoogipoo/fix-intermittent-test

Browse Source 
Fix intermittent update manager test, skin editor test not working on macOS
This commit is contained in:
Bartłomiej Dach
2025-08-04 08:25:24 +02:00
committed by GitHub
Unverified
parent 7c1c844b45 0270ca6cf1
commit 94075a6ba1
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/NonVisual/TestSceneUpdateManager.cs
+7
View File
@@ -48,6 +48,13 @@ namespace osu.Game.Tests.NonVisual
AddUntilStep("no check pending", () => !manager.IsPending);
}
[TearDownSteps]
public void TeardownSteps()
{
// Importantly, this immediately saves the config, which cancels any pending background save.
AddStep("dispose config manager", () => config.Dispose());
}
/// <summary>
/// Updates should be checked when the release stream is changed.
/// </summary>
osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs
+3 -18
View File
@@ -126,12 +126,7 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for accuracy counter", () => Game.ChildrenOfType<ArgonAccuracyCounter>().Any(counter => counter.Position != new Vector2()));
AddStep("dump state of accuracy meter", () => state = JsonConvert.SerializeObject(Game.ChildrenOfType<ArgonAccuracyCounter>().First().CreateSerialisedInfo()));
AddStep("add any component", () => Game.ChildrenOfType<SkinComponentToolbox.ToolboxComponentButton>().First().TriggerClick());
AddStep("undo", () =>
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.Z);
InputManager.ReleaseKey(Key.ControlLeft);
});
AddStep("undo", () => InputManager.Keys(PlatformAction.Undo));
AddUntilStep("only one accuracy meter left",
() => Game.ChildrenOfType<Player>().Single().ChildrenOfType<ArgonAccuracyCounter>().Count(),
() => Is.EqualTo(1));
@@ -163,12 +158,7 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for accuracy counter", () => Game.ChildrenOfType<ArgonAccuracyCounter>().Any(counter => counter.Position != new Vector2()));
AddStep("dump state of accuracy meter", () => state = JsonConvert.SerializeObject(Game.ChildrenOfType<ArgonAccuracyCounter>().First().CreateSerialisedInfo()));
AddStep("add any component", () => Game.ChildrenOfType<SkinComponentToolbox.ToolboxComponentButton>().First().TriggerClick());
AddStep("undo", () =>
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.Z);
InputManager.ReleaseKey(Key.ControlLeft);
});
AddStep("undo", () => InputManager.Keys(PlatformAction.Undo));
AddUntilStep("only one accuracy meter left",
() => Game.ChildrenOfType<Player>().Single().ChildrenOfType<ArgonAccuracyCounter>().Count(),
() => Is.EqualTo(1));
@@ -190,12 +180,7 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for components", () => skinEditor.ChildrenOfType<SkinBlueprint>().Any());
AddStep("select all components", () =>
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.A);
InputManager.ReleaseKey(Key.ControlLeft);
});
AddStep("select all components", () => InputManager.Keys(PlatformAction.SelectAll));
AddUntilStep("components selected", () => skinEditor.SelectedComponents.Count > 0);