Check if updates weren't installed to not hard fail #56256
Merged
+241
−14
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
twangboy
approved these changes
Feb 26, 2020
twangboy
previously approved these changes
Feb 26, 2020
|
@xeacott last change was made 3 weeks ago. Is it still WIP? |
DmitryKuzmenko
previously approved these changes
Apr 3, 2020
|
@xeacott any updates on this? |
|
Yes sorry, have not been able to focus on Open PRs for quite some time now - anyways, this needs an entire test suite written for the module and I haven't had a chance yet ... but I'll add that to my list for this week. |
|
There exists this PR #56637 that includes additions to unit and integration tests that I will utilize in this PR, so I will wait for that PR to be merged and then tests will be written. |
DmitryKuzmenko
suggested changes
May 15, 2020
salt/states/win_wua.py
Outdated
Comment on lines
490
to
495
| updates_not_installed = [item for item in install.list() if item not in post_info] | ||
|
|
||
| # Verify the installation | ||
| for item in install.list(): | ||
| if not salt.utils.data.is_true(post_info[item]["Installed"]): | ||
| ret["changes"]["failed"] = { | ||
| item: { | ||
| "Title": post_info[item]["Title"][:40] + "...", | ||
| "KBs": post_info[item]["KBs"], | ||
| # Only check for items that were installed | ||
| if item not in updates_not_installed: |
There was a problem hiding this comment.
These two loops are iterating the same list so could be one:
updates_not_installed = []
for item in install.list():
if item not in post_info:
updates_not_installd.append(item)
else:the next line is the if below.
salt/states/win_wua.py
Outdated
|
|
||
| # Add the list of updates not installed to the return | ||
| if len(updates_not_installed) > 0: |
There was a problem hiding this comment.
I wonder lint said you nothing about his. Please change to if updates_not_installed:
DmitryKuzmenko
approved these changes
May 15, 2020
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.
What does this PR do?
Corrects the list of updates that were actually installed by the WUA and returns a list of updates that
were not installed on the box due to various reasons, superseded, cumulative update, etc.
What issues does this PR fix or reference?
#52387
Tests written?
Needs tests
Commits signed with GPG?
No