Merge pull request ppy#16194 from peppy/fix-results-screen-wait-test

Fix intermittent test failures on `TestSceneResultsScreen` due to long delay step
smoogipoo · Dec 21, 2021 · a53c67b · a53c67b
2 parents 32fbaf4 + c0a8758
commit a53c67b
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -203,15 +203,23 @@ public void TestFetchScoresAfterShowingStatistics()
         {
             DelayedFetchResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(), 3000)));
+            var tcs = new TaskCompletionSource();
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(), tcs.Task)));
+
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
             AddStep("click expanded panel", () =>
             {
                 var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
                 InputManager.MoveMouseTo(expandedPanel);
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddAssert("no fetch yet", () => !screen.FetchCompleted);
+
+            AddStep("allow fetch", () => tcs.SetResult());
+
             AddUntilStep("wait for fetch", () => screen.FetchCompleted);
             AddAssert("expanded panel still on screen", () => this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded).ScreenSpaceDrawQuad.TopLeft.X > 0);
         }
@@ -295,21 +303,21 @@ protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresC
 
         private class DelayedFetchResultsScreen : TestResultsScreen
         {
-            public bool FetchCompleted { get; private set; }
+            private readonly Task fetchWaitTask;
 
-            private readonly double delay;
+            public bool FetchCompleted { get; private set; }
 
-            public DelayedFetchResultsScreen(ScoreInfo score, double delay)
+            public DelayedFetchResultsScreen(ScoreInfo score, Task fetchWaitTask = null)
                 : base(score)
             {
-                this.delay = delay;
+                this.fetchWaitTask = fetchWaitTask ?? Task.CompletedTask;
             }
 
             protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
             {
                 Task.Run(async () =>
                 {
-                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
+                    await fetchWaitTask;
 
                     var scores = new List<ScoreInfo>();