From f81e32149b70988e4cef48129d639c34a45b9eac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Dec 2021 13:38:20 +0900
Subject: [PATCH] Fix `ImportCollectionsTest.TestSaveAndReload` not cleaning up
 before/after run

---
 osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs | 4 ++--
 osu.Game/Tests/CleanRunHeadlessGameHost.cs             | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
index d87ac29d75..ef1c993a66 100644
--- a/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
+++ b/osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Tests.Collections.IO
         [Test]
         public async Task TestSaveAndReload()
         {
-            using (HeadlessGameHost host = new TestRunHeadlessGameHost("TestSaveAndReload", bypassCleanup: true))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(bypassCleanup: true))
             {
                 try
                 {
@@ -149,7 +149,7 @@ namespace osu.Game.Tests.Collections.IO
                 }
             }
 
-            using (HeadlessGameHost host = new TestRunHeadlessGameHost("TestSaveAndReload"))
+            using (HeadlessGameHost host = new TestRunHeadlessGameHost(nameof(TestSaveAndReload)))
             {
                 try
                 {
diff --git a/osu.Game/Tests/CleanRunHeadlessGameHost.cs b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
index d7ab769ac4..7d7f011f6a 100644
--- a/osu.Game/Tests/CleanRunHeadlessGameHost.cs
+++ b/osu.Game/Tests/CleanRunHeadlessGameHost.cs
@@ -17,9 +17,10 @@ namespace osu.Game.Tests
         /// <param name="gameSuffix">An optional suffix which will isolate this host from others called from the same method source.</param>
         /// <param name="bindIPC">Whether to bind IPC channels.</param>
         /// <param name="realtime">Whether the host should be forced to run in realtime, rather than accelerated test time.</param>
+        /// <param name="bypassCleanup">Whether to bypass directory cleanup on host disposal. Should be used only if a subsequent test relies on the files still existing.</param>
         /// <param name="callingMethodName">The name of the calling method, used for test file isolation and clean-up.</param>
-        public CleanRunHeadlessGameHost(string gameSuffix = @"", bool bindIPC = false, bool realtime = true, [CallerMemberName] string callingMethodName = @"")
-            : base(callingMethodName + gameSuffix, bindIPC, realtime)
+        public CleanRunHeadlessGameHost(string gameSuffix = @"", bool bindIPC = false, bool realtime = true, bool bypassCleanup = false, [CallerMemberName] string callingMethodName = @"")
+            : base(callingMethodName + gameSuffix, bindIPC, realtime, bypassCleanup: bypassCleanup)
         {
         }