Fix assert_symlink_to for temp files in OSX #56
Merged
Conversation
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
martin-schulze-vireso
requested changes
Mar 14, 2023
martin-schulze-vireso
approved these changes
Mar 14, 2023
added 3 commits
March 17, 2023 09:41
The `assert_symlink_to` function uses `_bats_file_readlinkf_macos` for OSX, which prepends the physical directory to the target file, but the assertion in `assert_symlink_to` compares the resolved link to the provided `sourcefile`, which does not have this physical directory, so the assertion will fail in some cases where these two differ, e.g. in a temp directory: ```bash realsource=/private/var/folders/mm/241yd_bn0b5095s4tgq_r84c0000gq/T/65-assert-10-assert_symlink_to.bats-3-8MdiJY/file sourcefile=/var/folders/mm/241yd_bn0b5095s4tgq_r84c0000gq/T/65-assert-10-assert_symlink_to.bats-3-8MdiJY/file ``` This commit fixes the issue by defining a `realexpectedsource` variable which results from calling `_bats_file_readlinkf_macos` with the `sourcefile`, and makes that comparison instead, so that `realsource` matches the `realexpectedsource` for paths with a physical directory: ```bash realexpectedsource=/private/var/folders/mm/241yd_bn0b5095s4tgq_r84c0000gq/T/65-assert-10-assert_symlink_to.bats-3-8MdiJY/file ``` This was tested by adding a new unit test in the `65-assert-10-assert_symlink_to.bats` file, which fails with the previous logic and passes with the fix.
julian-mateu
force-pushed
the
fix-assert_symlink_to-for-temp-files
branch
from
bbbbb5f
to
7d6add4
Compare
|
Merging was blocked because of missing signature on previous commits. I had to rebase and sign them, and force push. |
|
Thanks for your contribution. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Why?
The
assert_symlink_tofunction uses_bats_file_readlinkf_macosfor OSX, which prepends the physical directory to the target file, but the assertion inassert_symlink_tocompares the resolved link to the providedsourcefile, which does not have this physical directory, so the assertion will fail in some cases where these two differ, e.g. in a temp directory:What?
This commit fixes the issue by defining a
realexpectedsourcevariable which results from calling_bats_file_readlinkf_macoswith thesourcefile, and makes that comparison instead, so thatrealsourcematches therealexpectedsourcefor paths with a physical directory:Testing
This was tested by adding a new unit test in the
65-assert-10-assert_symlink_to.batsfile, which fails with the previous logic and passes with the fix.