Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tar test data version #77785

Merged
merged 3 commits into from
Nov 3, 2022
Merged

Update tar test data version #77785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
510a362
Update tar test data version
am11 Nov 2, 2022
b2be9a5
Fix typo
am11 Nov 2, 2022
297b626
Merge branch 'main' into feature/libs/System.Formats.Tar/testdata-update
am11 Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>42999f1b16859553727672ef4087742aab7be681</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22531.1">
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22552.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>42999f1b16859553727672ef4087742aab7be681</Sha>
<Sha>a6e2984f63e3809fcdc607bc88bbf257a6c6b4e4</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22531.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22531.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22531.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22531.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22531.1</SystemFormatsTarTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22552.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22531.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22531.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22531.1</SystemNetTestDataVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...ibraries/System.Formats.Tar/tests/TarFile/TarFile.ExtractToDirectoryAsync.Stream.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public async Task ExtractEntry_DockerImageTarWithFileTypeInDirectoriesInMode_Suc
{
using (TempDirectory root = new TempDirectory())
{
await using MemoryStream archiveStream = GetTarMemoryStream(CompressionMethod.Uncompressed, "golang_tar", "docker-hello-world");
await using MemoryStream archiveStream = GetTarMemoryStream(CompressionMethod.Uncompressed, "misc", "docker-hello-world");
await TarFile.ExtractToDirectoryAsync(archiveStream, root.Path, overwriteFiles: true);

Assert.True(File.Exists(Path.Join(root.Path, "manifest.json")));
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/System.Formats.Tar/tests/TarReader/TarReader.File.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ public void Throw_SingleExtendedAttributesEntryWithNoActualEntry()
Assert.Throws<EndOfStreamException>(() => reader.GetNextEntry());
}

[Fact]
public void ReadDataStreamOfGoLangTarGzGnu()
{
using MemoryStream archiveStream = GetTarMemoryStream(CompressionMethod.GZip, "golang_tar", "pax-bad-hdr-large");
adamsitnik marked this conversation as resolved.
Show resolved Hide resolved
using GZipStream decompressor = new GZipStream(archiveStream, CompressionMode.Decompress);
VerifyDataStreamOfTarInternal(decompressor, copyData: false);
}

[Theory]
[InlineData("tar-rs", "spaces")]
[InlineData("golang_tar", "v7")]
Expand Down