Merge branch 'master' into add-slider-whistle

This commit is contained in:
Dan Balasescu 2021-04-08 22:23:50 +09:00 committed by GitHub
commit 7e1739812d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
AddWaitStep("wait", 10); AddUntilStep("wait for join", () => Client.Room != null);
} }
[Test] [Test]
@ -114,6 +114,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
AddUntilStep("wait for room join", () => Client.Room != null);
AddStep("join other user (ready)", () => AddStep("join other user (ready)", () =>
{ {
Client.AddUser(new User { Id = 55 }); Client.AddUser(new User { Id = 55 });