From f5bc389998283eca1a7e4d0363945f1800840aa7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:31:32 +0900
Subject: [PATCH] Fix flaky tests

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index f2331542c6..69fbd56490 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -14,6 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -56,7 +58,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -80,7 +82,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -118,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -157,13 +159,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("play started", () => !multiplayerScreen.IsCurrentScreen());
         }
 
-        private void createRoom(Room room)
+        private void createRoom(Func<Room> room)
         {
             AddStep("open room", () =>
             {
-                multiplayerScreen.OpenNewRoom(room);
+                multiplayerScreen.OpenNewRoom(room());
             });
 
+            AddUntilStep("wait for room open", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().FirstOrDefault()?.IsLoaded == true);
+            AddWaitStep("wait for transition", 2);
+
             AddStep("create room", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());