From 0f8a6a3f64d3ebae4351b44b3c75a76277eea74e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 21 Dec 2021 14:10:38 +0900 Subject: [PATCH] Fix intermittent failures on `TestSceneBeatmapListingOverlay` In the specific method, there was no wait step after the initial fetch (unlike all of the rest), meaning the fetch may not have finished in time for the follow-up steps. As seen at https://github.com/ppy/osu/runs/4588058438?check_suite_focus=true. --- .../Visual/Online/TestSceneBeatmapListingOverlay.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs index cbb6dce4d6..80f7d0ca29 100644 --- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs +++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs @@ -127,6 +127,7 @@ namespace osu.Game.Tests.Visual.Online public void TestUserWithoutSupporterUsesSupporterOnlyFiltersWithoutResults() { AddStep("fetch for 0 beatmaps", () => fetchFor()); + AddStep("set dummy as non-supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = false); // only Rank Achieved filter @@ -187,6 +188,9 @@ namespace osu.Game.Tests.Visual.Online public void TestUserWithoutSupporterUsesSupporterOnlyFiltersWithResults() { AddStep("fetch for 1 beatmap", () => fetchFor(CreateAPIBeatmapSet(Ruleset.Value))); + + noPlaceholderShown(); + AddStep("set dummy as non-supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = false); // only Rank Achieved filter @@ -217,6 +221,9 @@ namespace osu.Game.Tests.Visual.Online public void TestUserWithSupporterUsesSupporterOnlyFiltersWithResults() { AddStep("fetch for 1 beatmap", () => fetchFor(CreateAPIBeatmapSet(Ruleset.Value))); + + noPlaceholderShown(); + AddStep("set dummy as supporter", () => ((DummyAPIAccess)API).LocalUser.Value.IsSupporter = true); // only Rank Achieved filter @@ -280,9 +287,8 @@ namespace osu.Game.Tests.Visual.Online private void noPlaceholderShown() { - AddUntilStep("no placeholder shown", () => - !overlay.ChildrenOfType().Any(d => d.IsPresent) - && !overlay.ChildrenOfType().Any(d => d.IsPresent)); + AddUntilStep("\"supporter required\" placeholder not shown", () => !overlay.ChildrenOfType().Any(d => d.IsPresent)); + AddUntilStep("\"no maps found\" placeholder not shown", () => !overlay.ChildrenOfType().Any(d => d.IsPresent)); } } }