cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-19 03:53:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test OD repo extraction

Browse Source
This commit is contained in:
Jordan Dominion
2023-10-14 22:47:29 -04:00
parent 1f2e4494a2
commit cb7bddb481
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/TestVersions.cs
+1 -1
View File
@@ -406,7 +406,7 @@ namespace Tgstation.Server.Tests
Assert.AreEqual(latestMigrationSL, DatabaseContext.SLLatestMigration);
}
static async Task<Tuple<MemoryStream, ByondVersion>> GetByondVersionPriorTo(ByondInstallerBase byondInstaller, Version version)
static async Task<Tuple<Stream, ByondVersion>> GetByondVersionPriorTo(ByondInstallerBase byondInstaller, Version version)
{
var minusOneMinor = new Version(version.Major, version.Minor - 1);
var byondVersion = new ByondVersion
tests/Tgstation.Server.Tests/TestingUtils.cs
+10 -2
View File
@@ -33,7 +33,7 @@ namespace Tgstation.Server.Tests
return mockLoggerFactory.Object;
}
public static async ValueTask<MemoryStream> ExtractMemoryStreamFromInstallationData(IEngineInstallationData engineInstallationData, CancellationToken cancellationToken)
public static async ValueTask<Stream> ExtractMemoryStreamFromInstallationData(IEngineInstallationData engineInstallationData, CancellationToken cancellationToken)
{
if (engineInstallationData is ZipStreamEngineInstallationData zipStreamData)
return (MemoryStream)zipStreamData.GetType().GetField("zipStream", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(zipStreamData);
@@ -44,7 +44,15 @@ namespace Tgstation.Server.Tests
try
{
await repoData.ExtractToPath(tempFolder, cancellationToken);
var resultStream = new MemoryStream();
var resultStream = new FileStream(
$"{tempFolder}.zip",
FileMode.Create,
FileAccess.ReadWrite,
FileShare.Read | FileShare.Delete,
4096,
FileOptions.Asynchronous);
File.Delete(resultStream.Name); // now we have a ghost file that will delete when the stream closes
try
{
ZipFile.CreateFromDirectory(tempFolder, resultStream, CompressionLevel.NoCompression, false);