Fix logging in export_history.py, fix Azure and S3 tests #19542
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
On line 59 from export_history.py, `actual_uri = _write_to_destination(options.file_sources, os.path.abspath(out_file), destination_uri)`, but `_write_to_destination()` yields just the path of the saved file, so `destination_uri != actual_uri` is always `True` and the print statement always kicks-in. In addition, `write_from()` from test/unit/files/_util.py is wrong in a way such that `assert_can_write_and_read_to_conf()` from the same file should always fail. It went unnoticed just because the tests that use it are skipped by default.
kysrpex
commented
Feb 5, 2025
Comment on lines
-2662
to
2665
| file_source_uri = urlparse(str(self.file_source_uri)) | ||
| file_source_path = self.file_sources.get_file_source_path(self.file_source_uri) | ||
| file_source = file_source_path.file_source | ||
| assert os.path.exists(self.out_file) | ||
| self.file_source_uri = f"{file_source_uri.scheme}://{file_source_uri.netloc}" + file_source.write_from( | ||
| self.file_source_uri = f"{file_source.get_scheme()}://{file_source.get_prefix()}" + file_source.write_from( | ||
| file_source_path.path, self.out_file, user_context=self.user_context |
There was a problem hiding this comment.
Shouldn't have any effect.
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.
TL;DR Absolute non-issue, really irrelevant fix, just noticed things were wrong while fixing something else.
On line 59 from export_history.py,
actual_uri = _write_to_destination(options.file_sources, os.path.abspath(out_file), destination_uri), but_write_to_destination()yields just the path of the saved file, sodestination_uri != actual_uriis alwaysTrueand the print statement always kicks-in.In addition,
write_from()from test/unit/files/_util.py is wrong in a way such thatassert_can_write_and_read_to_conf()from the same file should always fail. It went unnoticed just because the tests that use it are skipped by default.How to test the changes?
(Select all options that apply)
License