win_reboot: fix minor issues with the latest refactor #44740
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
ansibot
added
affects_2.7
dagwieers
approved these changes
Aug 28, 2018
samdoran
suggested changes
Aug 28, 2018
lib/ansible/plugins/action/reboot.py
Outdated
| @@ -274,8 +283,9 @@ def run(self, tmp=None, task_vars=None): | |||
|
|
|||
| if reboot_result['failed']: | |||
| result = reboot_result | |||
| elapsed = datetime.utcnow() - reboot_result['start'] | |||
| result['elapsed'] = elapsed.seconds | |||
| if 'start' in reboot_result: | |||
There was a problem hiding this comment.
I would like to always return elapsed, which means always returning result['start']. This is done here in reboot.py. That change didn't make it to win_reboot.py. Sorry about that.
There was a problem hiding this comment.
No worries will add that in now
There was a problem hiding this comment.
Yeah, I prefer having elapsed returned always, we do that for other modules too.
#37969
(feel free to approve my work there ;-))
ansibot
added
the
needs_revision
samdoran
approved these changes
Aug 28, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
SUMMARY
Fixes a few issues with the recent reboot refactoring and the win_reboot tests;
run_test_commandon a failure, this solves the issue where the host si rebooting multiple times and winrm needs to reset the shell id so it starts working againperform_reboot()didn't succeedISSUE TYPE
COMPONENT NAME
win_reboot
ANSIBLE VERSION