5433 replace platform.linux distribution #5559
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
- Replace deprecated platform.linux_distribution function by reading the os version directly from /etc/lsb-release. - Update mock in test_metadata_route to reflect new server_os variable.
kushaldas
approved these changes
Oct 7, 2020
| @@ -8,6 +7,10 @@ | |||
| import version | |||
|
|
|||
|
|
|||
| with open("/etc/lsb-release", "r") as f: | |||
There was a problem hiding this comment.
/etc/lsb-release comes from the base-files package.
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.
Status
Ready for review.
Description of Changes
Fixes #5433
Changes proposed in this pull request:
platform.linux_distributionfunction by reading the os version directly from/etc/lsb-release.tests/test_source.py::test_metadata_routeto reflect new server_os variable.Testing
How should the reviewer test this PR?
Write out any special testing steps here.
make tests. Theserver_osvalue returned by the/metadataendpoint is verified intests/functional/test_source_metadata.py::TestInstanceMetadata::test_instance_metadata.make devand verify theserver_osparameter on/metadataequals "16.04".Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint) and tests (make test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerN/A.
If you made changes to the system configuration:
N/A.
If you made non-trivial code changes:
N/A. Already covered by functional test.
If you made changes to documentation:
make docs-lint) passed locallyN/A.
If you added or updated a code dependency:
Choose one of the following:
N/A.