system.reboot instead of system.restart #60111
Merged
Conversation
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
twangboy
changed the title
xeacott
approved these changes
May 25, 2021
Ch3LL
approved these changes
Jun 1, 2021
waynew
approved these changes
Jun 1, 2021
| "Success": True, | ||
| } | ||
|
|
||
| mock_reboot = MagicMock(return_value=True) |
Contributor
There was a problem hiding this comment.
suggestion (non-blocking) FWIW, a great way to avoid the problem of non-existent functions is to use create_autospec. Sometimes it's no bueno, but usually:
mock_reboot = create_autospec(return_value=True)
Found wherever other useful Mocks are sold!
|
|
||
| mock_reboot = MagicMock(return_value=True) | ||
| with patch.object( | ||
| win_servermanager, "_pshell_json", return_value=mock_out |
Contributor
There was a problem hiding this comment.
suggestion(non-blocking) Then in cases like this, adding autospec=True to the patch call, will ensure that the mock looks like the real _pshell_json.
| } | ||
| ], | ||
| "ExitCode": 0, | ||
| } |
Contributor
There was a problem hiding this comment.
suggestion (non-blocking): note that when the same data is found in multiple tests, especially if the same function is mocked to return that same data each time, that's an ideal place to use a pytest fixture.
sagetherage
added
Aluminium
sagetherage
added
Silicon v3004.0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
What does this PR do?
Uses
system.rebootinstead of the non-existentsystem.restartNeed to finish up the tests
What issues does this PR fix or reference?
Fixes: #59424
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes