os: fix join_path and join_path_singe to respect absolute paths #21752
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
JalonSolov
reviewed
Jun 28, 2024
| @@ -26,7 +26,7 @@ fn test_join_path() { | |||
| assert os.join_path('foo/bar', './file.txt') == r'foo\bar\file.txt' | |||
| assert os.join_path('/opt/v', './x') == r'\opt\v\x' | |||
| assert os.join_path('v', 'foo/bar', 'dir') == r'v\foo\bar\dir' | |||
| assert os.join_path('v', 'foo/bar\\baz', '/dir') == r'v\foo\bar\baz\dir' | |||
| assert os.join_path('v', 'foo/bar\\baz', '/dir') == r'/dir' | |||
There was a problem hiding this comment.
Shouldn't it be r'v\foo\bar\baz\dir'?
JalonSolov
reviewed
Jun 28, 2024
| @@ -40,14 +40,14 @@ fn test_join_path() { | |||
| assert os.join_path('foo/bar', './file.txt') == 'foo/bar/file.txt' | |||
| assert os.join_path('/opt/v', './x') == '/opt/v/x' | |||
| assert os.join_path('/foo/bar', './.././file.txt') == '/foo/bar/../file.txt' | |||
| assert os.join_path('v', 'foo/bar\\baz', '/dir') == r'v/foo/bar/baz/dir' | |||
| assert os.join_path('v', 'foo/bar\\baz', '/dir') == '/dir' | |||
There was a problem hiding this comment.
And here v/foo/bar/baz/dir.
Delta456
reviewed
Jun 28, 2024
| } | ||
| } | ||
|
|
||
| fn test_join_path_single() { | ||
| assert os.join_path_single('', '') == '' | ||
| assert os.join_path_single('', './b') == 'b' | ||
| assert os.join_path_single('', '/b') == 'b' | ||
| assert os.join_path_single('', '/b') == '/b' |
There was a problem hiding this comment.
I believe it should be r'/b' instead.
|
The later arguments to join_path are relative and not absolute. |
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.
Fixes issue #21751 where by absolute paths in second and subsequent arguments in
join_pathandjoin_path_singlewere treated as relative paths instead of absolute paths.Required changing several tests in join_path_text.v, which made incorrect assertions about join_path responses.