From 7cf6b551d353ffd8393b3ed4d7489f5c6d23bca3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 13 Aug 2021 13:01:17 +0300
Subject: [PATCH] Replace until step with wait step with explanatory comment

---
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 080a1502b0..62a9b597ad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -93,10 +93,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("all player loader settings hidden", () => this.ChildrenOfType<PlayerLoader>().All(l => !l.ChildrenOfType<FillFlowContainer<PlayerSettingsGroup>>().Any()));
 
             AddUntilStep("wait for players to load", () => spectatorScreen.AllPlayersLoaded);
-            AddUntilStep("all interactive elements removed", () => this.ChildrenOfType<Player>().All(p =>
+
+            // components wrapped in skinnable target containers load asynchronously, potentially taking more than one frame to load.
+            // wait once to properly execute the assert.
+            AddWaitStep("wait for async load", 1);
+
+            AddAssert("all interactive elements removed", () => this.ChildrenOfType<Player>().All(p =>
                 !p.ChildrenOfType<PlayerSettingsOverlay>().Any() &&
                 !p.ChildrenOfType<HoldForMenuButton>().Any() &&
-                p.ChildrenOfType<SongProgressBar>().SingleOrDefault()?.ShowHandle == false));
+                !p.ChildrenOfType<SongProgressBar>().Single().ShowHandle));
         }
 
         [Test]