gpg: set default in function to allow global patch#543
Merged
lukpueh merged 1 commit intosecure-systems-lab:mainfrom Mar 21, 2023
Merged
gpg: set default in function to allow global patch#543lukpueh merged 1 commit intosecure-systems-lab:mainfrom
lukpueh merged 1 commit intosecure-systems-lab:mainfrom
Conversation
Patching globals to modify function behavior is an anti-pattern and should not be recommended to a user!! But it seems acceptable in tests (see secure-systems-lab#542). For this to work, the global must not be used before being modified, which, AFAIK, is not possible, if the global is defined and used (e.g. in a function signature) in the same scope. This commit changes the relevant function to access the default value in local scope, so that it global can be imported and modified before it. More invasive but probably more correct solutions would be: - move either GPG_TIMEOUT or is_available_gnupg to a different module, or - call relevant functions in tests with an explicit timeout arg Signed-off-by: Lukas Puehringer <[email protected]>
jku
approved these changes
Mar 21, 2023
Collaborator
jku
left a comment
There was a problem hiding this comment.
This seems correct even if the other improvements are later planned
This file contains hidden or 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
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.
Patching globals to modify function behavior is an anti-pattern and should not be recommended to a user!!
But it seems acceptable in tests (see #542). For this to work, the global must not be used before being modified, which, AFAIK, is not possible, if the global is defined and used (e.g. in a function signature) in the same scope.
This commit changes the relevant function to access the default value in local scope, so that it global can be imported and modified before it.
More invasive but probably more correct solutions would be: