-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Tar: Add missing TarFile.CreateFromDirectoryAsync roundtrip tests #84303
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...aries/System.Formats.Tar/tests/TarFile/TarFile.CreateFromDirectoryAsync.File.Roundtrip.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
using System.IO; | ||
using System.Threading.Tasks; | ||
using Xunit; | ||
|
||
namespace System.Formats.Tar.Tests | ||
{ | ||
public class TarFile_CreateFromDirectoryAsync_Roundtrip_Tests : TarTestsBase | ||
{ | ||
[ConditionalTheory(typeof(MountHelper), nameof(MountHelper.CanCreateSymbolicLinks))] | ||
[InlineData("./file.txt", "subDirectory")] | ||
[InlineData("../file.txt", "subDirectory")] | ||
[InlineData("../file.txt", "subDirectory1/subDirectory1.1")] | ||
[InlineData("./file.txt", "subDirectory1/subDirectory1.1")] | ||
[InlineData("./file.txt", null)] | ||
public async Task SymlinkRelativeTargets_InsideTheArchive_RoundtripsSuccessfully_Async(string symlinkTargetPath, string subDirectory) | ||
{ | ||
using TempDirectory root = new TempDirectory(); | ||
|
||
string destinationArchive = Path.Join(root.Path, "destination.tar"); | ||
|
||
string sourceDirectoryName = Path.Join(root.Path, "baseDirectory"); | ||
Directory.CreateDirectory(sourceDirectoryName); | ||
|
||
string destinationDirectoryName = Path.Join(root.Path, "destinationDirectory"); | ||
Directory.CreateDirectory(destinationDirectoryName); | ||
|
||
string sourceSubDirectory = Path.Join(sourceDirectoryName, subDirectory); | ||
if (subDirectory != null) Directory.CreateDirectory(sourceSubDirectory); | ||
|
||
File.Create(Path.Join(sourceDirectoryName, subDirectory, symlinkTargetPath)).Dispose(); | ||
File.CreateSymbolicLink(Path.Join(sourceSubDirectory, "linkToFile"), symlinkTargetPath); | ||
|
||
await TarFile.CreateFromDirectoryAsync(sourceDirectoryName, destinationArchive, includeBaseDirectory: false); | ||
|
||
await using FileStream archiveStream = File.OpenRead(destinationArchive); | ||
await TarFile.ExtractToDirectoryAsync(archiveStream, destinationDirectoryName, overwriteFiles: true); | ||
|
||
string destinationSubDirectory = Path.Join(destinationDirectoryName, subDirectory); | ||
string symlinkPath = Path.Join(destinationSubDirectory, "linkToFile"); | ||
Assert.True(File.Exists(symlinkPath)); | ||
|
||
FileInfo? fileInfo = new(symlinkPath); | ||
Assert.Equal(symlinkTargetPath, fileInfo.LinkTarget); | ||
|
||
FileSystemInfo? symlinkTarget = File.ResolveLinkTarget(symlinkPath, returnFinalTarget: true); | ||
Assert.True(File.Exists(symlinkTarget.FullName)); | ||
} | ||
|
||
[ConditionalTheory(typeof(MountHelper), nameof(MountHelper.CanCreateSymbolicLinks))] | ||
[InlineData("../file.txt", null)] | ||
[InlineData("../../file.txt", "subDirectory")] | ||
public async Task SymlinkRelativeTargets_OutsideTheArchive_Fails_Async(string symlinkTargetPath, string subDirectory) | ||
{ | ||
using TempDirectory root = new TempDirectory(); | ||
|
||
string destinationArchive = Path.Join(root.Path, "destination.tar"); | ||
|
||
string sourceDirectoryName = Path.Join(root.Path, "baseDirectory"); | ||
Directory.CreateDirectory(sourceDirectoryName); | ||
|
||
string destinationDirectoryName = Path.Join(root.Path, "destinationDirectory"); | ||
Directory.CreateDirectory(destinationDirectoryName); | ||
|
||
string sourceSubDirectory = Path.Join(sourceDirectoryName, subDirectory); | ||
if (subDirectory != null) Directory.CreateDirectory(sourceSubDirectory); | ||
|
||
File.CreateSymbolicLink(Path.Join(sourceSubDirectory, "linkToFile"), symlinkTargetPath); | ||
|
||
await TarFile.CreateFromDirectoryAsync(sourceDirectoryName, destinationArchive, includeBaseDirectory: false); | ||
|
||
using FileStream archiveStream = File.OpenRead(destinationArchive); | ||
Exception exception = await Assert.ThrowsAsync<IOException>(() => TarFile.ExtractToDirectoryAsync(archiveStream, destinationDirectoryName, overwriteFiles: true)); | ||
|
||
Assert.Equal(SR.Format(SR.TarExtractingResultsLinkOutside, symlinkTargetPath, destinationDirectoryName), exception.Message); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess Path.Join handles null values fine but I would have probably put that operation into the if block below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, let me confirm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Join handles it properly: null is treated like empty string. The resulting path is just the first argument's path.
I would prefer to avoid restarting the CI for that, hope you don't mind.