Merge pull request #18914 from peppy/spectator-playback-test-leniences

Increase leniences on `TestSceneSpectatorPlayback.TestWithSendFailure`
ppy · Jun 28, 2022 · 8e4a6c4 · 8e4a6c4
2 parents 2f264aa + 22b254e
commit 8e4a6c4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -167,11 +167,16 @@ public void TestWithSendFailure()
             AddStep("start failing sends", () =>
             {
                 spectatorClient.ShouldFailSendingFrames = true;
-                framesReceivedSoFar = replay.Frames.Count;
                 frameSendAttemptsSoFar = spectatorClient.FrameSendAttempts;
             });
 
-            AddUntilStep("wait for send attempts", () => spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 5);
+            AddUntilStep("wait for next send attempt", () =>
+            {
+                framesReceivedSoFar = replay.Frames.Count;
+                return spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 1;
+            });
+
+            AddUntilStep("wait for more send attempts", () => spectatorClient.FrameSendAttempts > frameSendAttemptsSoFar + 10);
             AddAssert("frames did not increase", () => framesReceivedSoFar == replay.Frames.Count);
 
             AddStep("stop failing sends", () => spectatorClient.ShouldFailSendingFrames = false);

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -294,17 +294,21 @@ private void sendNextBundleIfRequired()
 
             lastSend = tcs.Task;
 
-            SendFramesInternal(bundle).ContinueWith(t => Schedule(() =>
+            SendFramesInternal(bundle).ContinueWith(t =>
             {
+                // Handle exception outside of `Schedule` to ensure it doesn't go unovserved.
                 bool wasSuccessful = t.Exception == null;
 
-                // If the last bundle send wasn't successful, try again without dequeuing.
-                if (wasSuccessful)
-                    pendingFrameBundles.Dequeue();
+                return Schedule(() =>
+                {
+                    // If the last bundle send wasn't successful, try again without dequeuing.
+                    if (wasSuccessful)
+                        pendingFrameBundles.Dequeue();
 
-                tcs.SetResult(wasSuccessful);
-                sendNextBundleIfRequired();
-            }));
+                    tcs.SetResult(wasSuccessful);
+                    sendNextBundleIfRequired();
+                });
+            });
         }
     }
 }