From 054ed546e3800e6aa0425b362b68dacf9e19fb75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Feb 2022 16:56:50 +0900
Subject: [PATCH] Fix intermittent failures in remaining test method

---
 .../Mods/TestSceneOsuModSpunOut.cs            | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index 70b7d1f740..a8953c1a6f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -26,13 +26,37 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         protected override bool AllowFail => true;
 
         [Test]
-        public void TestSpinnerAutoCompleted() => CreateModTest(new ModTestData
+        public void TestSpinnerAutoCompleted()
         {
-            Mod = new OsuModSpunOut(),
-            Autoplay = false,
-            Beatmap = singleSpinnerBeatmap,
-            PassCondition = () => Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault()?.Progress >= 1
-        });
+            DrawableSpinner spinner = null;
+            JudgementResult lastResult = null;
+
+            CreateModTest(new ModTestData
+            {
+                Mod = new OsuModSpunOut(),
+                Autoplay = false,
+                Beatmap = singleSpinnerBeatmap,
+                PassCondition = () =>
+                {
+                    // Bind to the first spinner's results for further tracking.
+                    if (spinner == null)
+                    {
+                        // We only care about the first spinner we encounter for this test.
+                        var nextSpinner = Player.ChildrenOfType<DrawableSpinner>().SingleOrDefault();
+
+                        if (nextSpinner == null)
+                            return false;
+
+                        lastResult = null;
+
+                        spinner = nextSpinner;
+                        spinner.OnNewResult += (o, result) => lastResult = result;
+                    }
+
+                    return lastResult?.Type == HitResult.Great;
+                }
+            });
+        }
 
         [TestCase(null)]
         [TestCase(typeof(OsuModDoubleTime))]