Fix FileTestCase.testFiles on windows with core.autocrlf input #25544
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
File size is dependent on how the project was checked out. When git is set up with core.autocrlf input, the checkout keeps the line endings as they are commited to the repository (as LF). On windows, the default System line seperator however is CTRLF. Previosly, CTRLF was used to replace LF, since the assumption was that the checkout matches the System line seperator. This is not true however if anything other than the default was choosen for core.autocrlf. On windows, this is quite easy to achieve, since git for windows even has a dialog in the installation wizard for this setting. This commit now changes the test to simply always read the file from the FS, instead of keeping a copy of the files content as a static variable. This solution is now agnostic to line seperators.
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.
File size is dependent on how the project was checked out. When git is set up with core.autocrlf input, the checkout keeps the line endings as they are commited to the repository (as LF).
On windows, the default System line seperator however is CTRLF.
Previosly, CTRLF was used to replace LF, since the assumption was that the checkout matches the System line seperator.
This is not true however if anything other than the default was choosen for core.autocrlf. On windows, this is quite easy to achieve, since git for windows even has a dialog in the installation wizard for this setting.
This commit now changes the test to simply always read the file from the FS, instead of keeping a copy of the files content as a static variable. This solution is now agnostic to line seperators.