From 82ea4456e42d7dd4b96243f5e97cb78347ecd2d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 22 Jul 2018 22:47:25 +0200
Subject: [PATCH 1/2] Fix testing regression

---
 osu.Game.Tests/Visual/TestCasePlaySongSelect.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
index b94fb42bf0..41c45f00f3 100644
--- a/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
@@ -54,6 +54,12 @@ namespace osu.Game.Tests.Visual
             public new BeatmapCarousel Carousel => base.Carousel;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            factory.ResetDatabase();
+            base.Dispose(isDisposing);
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {

From 2169a473253247b8bddeee98b27b9511b181c6f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Jul 2018 10:39:43 +0200
Subject: [PATCH 2/2] Prevent fatal failures on delete failures

---
 osu.Game/Tests/Visual/OsuTestCase.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs
index 8e09ec849c..67a13bd850 100644
--- a/osu.Game/Tests/Visual/OsuTestCase.cs
+++ b/osu.Game/Tests/Visual/OsuTestCase.cs
@@ -62,7 +62,16 @@ namespace osu.Game.Tests.Visual
             }
 
             if (localStorage.IsValueCreated)
-                localStorage.Value.DeleteDirectory(".");
+            {
+                try
+                {
+                    localStorage.Value.DeleteDirectory(".");
+                }
+                catch
+                {
+                    // we don't really care if this fails; it will just leave folders lying around from test runs.
+                }
+            }
         }
 
         protected override ITestCaseTestRunner CreateRunner() => new OsuTestCaseTestRunner();