Fix error triggered in label step execution not logged

ppy · Nov 11, 2024 · a73f205 · a73f205
1 parent 43fdea2
commit a73f205
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
@@ -590,7 +590,7 @@ private static IEnumerable getTestCaseSourceValue(MethodInfo testMethod, TestCas
         private void runTests(Action onCompletion)
         {
             int actualStepCount = 0;
-            CurrentTest.RunAllSteps(onCompletion, e => Logger.Log($@"Error on step: {e}"), s =>
+            CurrentTest.RunAllSteps(onCompletion, (s, e) => Logger.Error(e, $"Step {s} triggered an error"), s =>
             {
                 if (!interactive || RunAllSteps.Value)
                     return false;

diff --git a/osu.Framework/Testing/TestScene.cs b/osu.Framework/Testing/TestScene.cs
@@ -204,7 +204,7 @@ protected TestScene()
         private ScheduledDelegate stepRunner;
         private readonly ScrollContainer<Drawable> scroll;
 
-        public void RunAllSteps(Action onCompletion = null, Action<Exception> onError = null, Func<StepButton, bool> stopCondition = null, StepButton startFromStep = null)
+        public void RunAllSteps(Action onCompletion = null, Action<StepButton, Exception> onError = null, Func<StepButton, bool> stopCondition = null, StepButton startFromStep = null)
         {
             // schedule once as we want to ensure we have run our LoadComplete before attempting to execute steps.
             // a user may be adding a step in LoadComplete.
@@ -222,7 +222,7 @@ public void RunAllSteps(Action onCompletion = null, Action<Exception> onError =
 
         private StepButton loadableStep => actionIndex >= 0 ? StepsContainer.Children.ElementAtOrDefault(actionIndex) as StepButton : null;
 
-        private void runNextStep(Action onCompletion, Action<Exception> onError, Func<StepButton, bool> stopCondition)
+        private void runNextStep(Action onCompletion, Action<StepButton, Exception> onError, Func<StepButton, bool> stopCondition)
         {
             try
             {
@@ -242,7 +242,7 @@ private void runNextStep(Action onCompletion, Action<Exception> onError, Func<St
                     : "💥 Failed");
 
                 LoadingComponentsLogger.LogAndFlush();
-                onError?.Invoke(e);
+                onError?.Invoke(loadableStep, e);
                 return;
             }
 
@@ -306,7 +306,7 @@ public void AddLabel([NotNull] string description)
 
                     // kinda hacky way to avoid this doesn't get triggered by automated runs.
                     if (step.IsHovered)
-                        RunAllSteps(startFromStep: step, stopCondition: s => s is LabelStep);
+                        RunAllSteps(startFromStep: step, stopCondition: s => s is LabelStep, onError: (s, e) => Logger.Error(e, $"Step {s} triggered error"));
                 },
             });
         }

diff --git a/osu.Framework/Testing/TestSceneTestRunner.cs b/osu.Framework/Testing/TestSceneTestRunner.cs
@@ -76,7 +76,7 @@ void complete()
                     test.RunAllSteps(() =>
                     {
                         Scheduler.AddDelayed(complete, time_between_tests);
-                    }, e =>
+                    }, (_, e) =>
                     {
                         exception = ExceptionDispatchInfo.Capture(e);
                         complete();