From 789e25069fb3860b69db9c579b178613dab7b32d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Feb 2018 17:07:18 +0900
Subject: [PATCH] Fix non-visual tests not cleaning up previous executions

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  9 ++++-----
 osu.Game/Tests/CleanRunHeadlessGameHost.cs    | 19 +++++++++++++++++++
 osu.Game/Tests/Visual/OsuTestCase.cs          |  6 +-----
 osu.Game/osu.Game.csproj                      |  1 +
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Tests/CleanRunHeadlessGameHost.cs

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 490d4ec4d3..1ee8f6728a 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public void TestImportWhenClosed()
         {
             //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenClosed"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWhenClosed"))
             {
                 var osu = loadOsu(host);
 
@@ -44,11 +44,10 @@ namespace osu.Game.Tests.Beatmaps.IO
 
         [Test]
         [NonParallelizable]
-        [Ignore("Binding IPC on Appveyor isn't working (port in use). Need to figure out why")]
         public void TestImportOverIPC()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost("host", true))
-            using (HeadlessGameHost client = new HeadlessGameHost("client", true))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("host", true))
+            using (HeadlessGameHost client = new CleanRunHeadlessGameHost("client", true))
             {
                 Assert.IsTrue(host.IsPrimaryInstance);
                 Assert.IsFalse(client.IsPrimaryInstance);
@@ -74,7 +73,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public void TestImportWhenFileOpen()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenFileOpen"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWhenFileOpen"))
             {
                 var osu = loadOsu(host);
 
diff --git a/osu.Game/Tests/CleanRunHeadlessGameHost.cs b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
new file mode 100644
index 0000000000..b6ff6dcf84
--- /dev/null
+++ b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
@@ -0,0 +1,19 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Platform;
+
+namespace osu.Game.Tests
+{
+    /// <summary>
+    /// A headless host which cleans up before running (removing any remnants from a previous execution).
+    /// </summary>
+    public class CleanRunHeadlessGameHost : HeadlessGameHost
+    {
+        public CleanRunHeadlessGameHost(string gameName = @"", bool bindIPC = false, bool realtime = true)
+            : base(gameName, bindIPC, realtime)
+        {
+            Storage.DeleteDirectory(string.Empty);
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs
index f9f198a5c1..97aada2971 100644
--- a/osu.Game/Tests/Visual/OsuTestCase.cs
+++ b/osu.Game/Tests/Visual/OsuTestCase.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using osu.Framework.Platform;
 using osu.Framework.Testing;
 
 namespace osu.Game.Tests.Visual
@@ -11,11 +10,8 @@ namespace osu.Game.Tests.Visual
     {
         public override void RunTest()
         {
-            using (var host = new HeadlessGameHost($"test-{Guid.NewGuid()}", realtime: false))
-            {
-                host.Storage.DeleteDirectory(string.Empty);
+            using (var host = new CleanRunHeadlessGameHost($"test-{Guid.NewGuid()}", realtime: false))
                 host.Run(new OsuTestCaseTestRunner(this));
-            }
         }
 
         public class OsuTestCaseTestRunner : OsuGameBase
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index a5c3fc7f38..bb9925abbc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -855,6 +855,7 @@
     <Compile Include="Storyboards\StoryboardSample.cs" />
     <Compile Include="Storyboards\StoryboardSprite.cs" />
     <Compile Include="Tests\Beatmaps\TestWorkingBeatmap.cs" />
+    <Compile Include="Tests\CleanRunHeadlessGameHost.cs" />
     <Compile Include="Tests\Platform\TestStorage.cs" />
     <Compile Include="Tests\Visual\OsuTestCase.cs" />
     <Compile Include="Tests\Visual\TestCasePerformancePoints.cs" />