Merge pull request #1255 from peppy/fix-test-unload

Fix previous tests not correctly getting removed from TestBrowser
ppy · Dec 17, 2017 · 5da6990 · 5da6990
2 parents 675fb72 + f4de27f
commit 5da6990
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/osu.Framework/Testing/TestBrowser.cs b/osu.Framework/Testing/TestBrowser.cs
@@ -307,13 +307,14 @@ public void LoadTest(Type testType = null, Action onCompletion = null)
                 {
                     if (lastTest?.Parent != null)
                     {
-                        testContentContainer.Remove(lastTest);
+                        testContentContainer.Remove(lastTest.Parent);
                         lastTest.Clear();
                     }
 
                     if (CurrentTest != newTest)
                     {
-                        testContentContainer.Remove(newTest);
+                        // There could have been multiple loads fired after us. In such a case we want to silently remove ourselves.
+                        testContentContainer.Remove(newTest.Parent);
                         return;
                     }
 

diff --git a/osu.Framework/Testing/TestCase.cs b/osu.Framework/Testing/TestCase.cs
@@ -182,10 +182,7 @@ private void runNextStep(Action onCompletion, Action<Exception> onError)
                 if (actionIndex < 0)
                     text += $"{GetType().ReadableName()}";
                 else
-                {
-                    text += $"step {actionIndex + 1}";
-                    text = text.PadRight(16) + $"{loadableStep?.ToString() ?? string.Empty}";
-                }
+                    text += $"step {actionIndex + 1} {loadableStep?.ToString() ?? string.Empty}";
             }
 
             Console.Write(text);