h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 00:47:20 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest

Browse Source 
Fix ImportBeatmapTest not working on .net core
This commit is contained in:
Dean Herbert 2018-06-06 19:08:45 +09:00 committed by GitHub
commit 35d733fa97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -264,7 +264,8 @@ namespace osu.Game.Tests.Beatmaps.IO
private string createTemporaryBeatmap() private string createTemporaryBeatmap()
{ {
var temp = new FileInfo(osz_path).CopyTo(Path.GetTempFileName(), true).FullName; var temp = Path.GetTempFileName() + ".osz";
File.Copy(osz_path, temp, true);
Assert.IsTrue(File.Exists(temp)); Assert.IsTrue(File.Exists(temp));
return temp; return temp;
} }
@ -344,12 +345,12 @@ namespace osu.Game.Tests.Beatmaps.IO
private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000) private void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 60000)
{ {
Action waitAction = () => Task task = Task.Run(() =>
{ {
while (!result()) Thread.Sleep(200); while (!result()) Thread.Sleep(200);
}; });
Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout), failureMessage); Assert.IsTrue(task.Wait(timeout), failureMessage);
} }
} }
} }