From 0cd3894fa6235bfaef67ed5f595f5dd7e7aec0b5 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 10 Sep 2025 01:31:15 +0900 Subject: [PATCH] Fix multiple failing song select tests --- osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs index 553205d400..945ec5d207 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs +++ b/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using osu.Framework.Extensions; using osu.Framework.Graphics.Containers; using osu.Framework.Screens; using osu.Framework.Testing; @@ -310,7 +311,8 @@ namespace osu.Game.Tests.Visual.SongSelectV2 [Test] public void TestFilteringRunsAfterReturningFromGameplay() { - AddStep("import actual beatmap", () => Beatmaps.Import(TestResources.GetQuickTestBeatmapForImport())); + AddStep("import actual beatmap", () => Beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely()); + LoadSongSelect(); AddUntilStep("wait for filtered", () => SongSelect.ChildrenOfType().Single().FilterCount, () => Is.EqualTo(1)); @@ -590,7 +592,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 LoadSongSelect(); ImportBeatmapForRuleset(0); - AddAssert("options enabled", () => this.ChildrenOfType().Single().Enabled.Value); + AddUntilStep("options enabled", () => this.ChildrenOfType().Single().Enabled.Value); AddStep("click", () => this.ChildrenOfType().Single().TriggerClick()); AddUntilStep("popover displayed", () => this.ChildrenOfType().Any(p => p.IsPresent)); @@ -647,7 +649,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 ImportBeatmapForRuleset(0); - AddAssert("options enabled", () => this.ChildrenOfType().Single().Enabled.Value); + AddUntilStep("options enabled", () => this.ChildrenOfType().Single().Enabled.Value); AddStep("delete all beatmaps", () => Beatmaps.Delete()); AddAssert("beatmap selected", () => !Beatmap.IsDefault);